about summary refs log tree commit diff
path: root/Completion
diff options
context:
space:
mode:
authorOliver Kiddle <opk@users.sourceforge.net>2003-11-13 15:51:23 +0000
committerOliver Kiddle <opk@users.sourceforge.net>2003-11-13 15:51:23 +0000
commit2d241d0ff9f26f75d5923d896bd30c61b189b099 (patch)
tree6e16c2a221598e92dc9382a6279fe3bb674b6b98 /Completion
parentfb5cba5bb73631e54796c5964d6aa81b15a7f1c7 (diff)
downloadzsh-2d241d0ff9f26f75d5923d896bd30c61b189b099.tar.gz
zsh-2d241d0ff9f26f75d5923d896bd30c61b189b099.tar.xz
zsh-2d241d0ff9f26f75d5923d896bd30c61b189b099.zip
merge changes from 4.1
Diffstat (limited to 'Completion')
-rw-r--r--Completion/Unix/Command/.distfiles2
-rw-r--r--Completion/Unix/Command/_cvs4
-rw-r--r--Completion/Unix/Command/_nice14
-rw-r--r--Completion/Zsh/Command/_precommand6
4 files changed, 23 insertions, 3 deletions
diff --git a/Completion/Unix/Command/.distfiles b/Completion/Unix/Command/.distfiles
index fa947708f..5c99e85d4 100644
--- a/Completion/Unix/Command/.distfiles
+++ b/Completion/Unix/Command/.distfiles
@@ -20,5 +20,5 @@ _chkconfig    _cdcd         _irssi	  _sccs         _texinfo      _ant
 _global                     _figlet       _ifconfig     _last         _larch
 _lsof         _mt           _xmlsoft      _elinks       _tidy         _python
 _antiword     _renice       _sablotron    _cdrecord     _aap          _du
-_rar          _vorbis       _subversion   _screen
+_rar          _vorbis       _subversion   _screen       _nice
 '
diff --git a/Completion/Unix/Command/_cvs b/Completion/Unix/Command/_cvs
index 7ab72d341..ec047c38a 100644
--- a/Completion/Unix/Command/_cvs
+++ b/Completion/Unix/Command/_cvs
@@ -856,8 +856,8 @@ _cvs_existing_entries() {
   linedir="$match[1]"
   realdir=${(e)~linedir}
   [[ -f "$realdir"CVS/Entries ]] &&
-  [[ -n ${pat::="${(@j:|:)${(@)${(@)${(@)${(@M)${(@f)"$(<"$realdir"CVS/Entries)"}:#/*}#/}%%/*}//(#m)[][*?()<|^~#\\]/\\$MATCH}}"} ]] &&
-  _wanted files expl file _path_files -g "$pat"
+  pat=(${(@)${(@)${(@M)${(@f)"$(<"$realdir"CVS/Entries)"}:#/*}#/}%%/*})
+  (( ${#pat} )) && _wanted files expl file _path_files -a pat
 }
 
 (( $+functions[_cvs_modified_entries] )) ||
diff --git a/Completion/Unix/Command/_nice b/Completion/Unix/Command/_nice
new file mode 100644
index 000000000..f2f688368
--- /dev/null
+++ b/Completion/Unix/Command/_nice
@@ -0,0 +1,14 @@
+#compdef nice
+
+shift words
+(( CURRENT-- ))
+
+if [[ $CURRENT -gt 1 && $words[1] = [-+](-|)<-> ]]; then
+    shift words
+    (( CURRENT -- ))
+elif [[ $CURRENT -gt 2 && $words[1] = -n ]]; then
+    shift 2 words
+    (( CURRENT -= 2 ))
+fi
+
+_normal
diff --git a/Completion/Zsh/Command/_precommand b/Completion/Zsh/Command/_precommand
new file mode 100644
index 000000000..e48094721
--- /dev/null
+++ b/Completion/Zsh/Command/_precommand
@@ -0,0 +1,6 @@
+#compdef - nohup eval time rusage noglob nocorrect exec
+
+shift words
+(( CURRENT-- ))
+
+_normal