about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2008-02-19 22:52:18 +0000
committerBart Schaefer <barts@users.sourceforge.net>2008-02-19 22:52:18 +0000
commit9728d35cc2e872c1d1b485f68fcd3b8f7c60fbfa (patch)
tree1bebf57a05f12539bfa2beb8297d8a2257fe04ca
parentb784aad67a5306930659704613e69bafdacf9f6e (diff)
downloadzsh-9728d35cc2e872c1d1b485f68fcd3b8f7c60fbfa.tar.gz
zsh-9728d35cc2e872c1d1b485f68fcd3b8f7c60fbfa.tar.xz
zsh-9728d35cc2e872c1d1b485f68fcd3b8f7c60fbfa.zip
24570: don't attempt to pre-filter $commands on $PREFIX, just let compadd
deal with it.
-rw-r--r--ChangeLog6
-rw-r--r--Completion/Unix/Type/_path_commands2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bf44bb3ca..0c32988d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,12 @@
 	* 24572: Doc/Zsh/calsys.yo, Functions/Calendar/calendar_add:
 	add style reformate-date.
 
+2008-02-19  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 24570: Completion/Unix/Type/_path_commands: don't attempt to
+	pre-filter $commands on $PREFIX, just let compadd deal with it.
+	Fixes a bad interaction with the _approximate completer.
+
 2008-02-17  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* users/12600: Src/builtin.c: reorder handling of -s/-d/-t options
diff --git a/Completion/Unix/Type/_path_commands b/Completion/Unix/Type/_path_commands
index 714e2e232..722129a2d 100644
--- a/Completion/Unix/Type/_path_commands
+++ b/Completion/Unix/Type/_path_commands
@@ -52,7 +52,7 @@ fi
 if [[ -n $need_desc ]]; then
   typeset -a dcmds descs cmds
   local desc cmd sep
-  for cmd in ${(@)commands[(I)$PREFIX*]}; do
+  for cmd in ${(k)commands}; do
     desc=$_command_descriptions[$cmd]
     if [[ -z $desc ]]; then
       cmds+=$cmd