mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-11-19 12:20:52 +01:00
Code Releases Activity

Greg K: Replace 27377 with 27391.

Browse source
This commit is contained in:
Bart Schaefer 2009-11-12 04:19:42 +00:00
parent 96feec40a5
commit 31012c47d5
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,5 +1,8 @@
2009-11-11 Barton E. Schaefer <schaefer@zsh.org> 2009-11-11 Barton E. Schaefer <schaefer@zsh.org>
* Greg Klanderman: 27391: Completion/Unix/Command/_rm:
fix ignored (duplicate) file names
* users/14548: Src/Modules/termcap.c: prevent libtermcap from * users/14548: Src/Modules/termcap.c: prevent libtermcap from
exiting on an unknown terminal type exiting on an unknown terminal type
@ -11,9 +14,6 @@
2009-11-10 Barton E. Schaefer <schaefer@zsh.org> 2009-11-10 Barton E. Schaefer <schaefer@zsh.org>
* Greg Klanderman: 27377 (slightly tweaked):
Completion/Unix/Command/_rm: fix ignored (duplicate) file names
* 27368, 27369: FEATURES: replace one incorrect example with two * 27368, 27369: FEATURES: replace one incorrect example with two
correct ones correct ones
@ -12336,5 +12336,5 @@
***************************************************** *****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL * This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.4809 $ * $Revision: 1.4810 $
***************************************************** *****************************************************

7
Completion/Unix/Command/_rm
View file

@ -33,10 +33,11 @@ _arguments -C $opts \
case $state in case $state in
(file) (file)
declare -a ignored declare -a ignored
if ((CURRENT > 1)); then ignored=()
ignored=(${line[1,CURRENT-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH}) ((CURRENT > 1)) &&
ignored+=(${line[1,CURRENT-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH})
((CURRENT < $#line)) &&
ignored+=(${line[CURRENT+1,-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH}) ignored+=(${line[CURRENT+1,-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH})
fi
_files -F ignored && ret=0 _files -F ignored && ret=0
;; ;;
esac esac