summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Kiddle <opk@users.sourceforge.net>2003-04-23 12:00:57 +0000
committerOliver Kiddle <opk@users.sourceforge.net>2003-04-23 12:00:57 +0000
commit29a3496ebb91cc418db4b5ba66837c59c8170df5 (patch)
tree4a38ed495686762226c7345f8f293bae70114749
parent9e302211abf5c6403b15feb128a822921f13674e (diff)
downloadzsh-29a3496ebb91cc418db4b5ba66837c59c8170df5.tar.gz
zsh-29a3496ebb91cc418db4b5ba66837c59c8170df5.tar.xz
zsh-29a3496ebb91cc418db4b5ba66837c59c8170df5.zip
18462: complete files in addition to commands
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_sh4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ad25b8b1b..8fcebc5d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-04-23  Oliver Kiddle  <opk@zsh.org>
 
+	* 18462: Completion/Unix/Command/_sh: complete files in addition
+	to commands
+
 	* 18461: Completion/Unix/Type/_perl_builtin_funcs: handle cases
 	where the perlfunc man page is compressed
 
@@ -14,7 +17,7 @@
 
 	* 18458: Completion/Unix/Command/_renice: new completion for renice
 
-	* 18458: Completion/Base/Utility/_describe: handle the prefix-needed style
+	* 18458: Completion/Base/Utility/_describe: handle prefix-needed style
 
 2003-04-19  Felix Rosencrantz <f_rosencrantz@yahoo.com>
 
diff --git a/Completion/Unix/Command/_sh b/Completion/Unix/Command/_sh
index 559c6ad1b..9e72a2918 100644
--- a/Completion/Unix/Command/_sh
+++ b/Completion/Unix/Command/_sh
@@ -16,7 +16,9 @@ else
   local n=${words[(b:2:i)[^-]*]}
   if (( n <= CURRENT )); then
     compset -n $n
-    _normal && return 0
+    _alternative \
+      'files:file:_files' \
+      'commands:command:_normal' && return 0
   fi
   _default
 fi