summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Base/Completer/_expand_alias2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 97705d86b..9fbed5276 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-03-15  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
+	* Mikael: 27797: Completion/Base/Completer/_expand_alias:
+	delimit arguments to avoid problems with hyphens.
+
 	* Alexey: 27789: Completion/Unix/Command/_sudo: use _arguments.
 
 2010-03-15  Peter Stephenson  <pws@csr.com>
@@ -12900,5 +12903,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4930 $
+* $Revision: 1.4931 $
 *****************************************************
diff --git a/Completion/Base/Completer/_expand_alias b/Completion/Base/Completer/_expand_alias
index d950bf9f3..8848e668d 100644
--- a/Completion/Base/Completer/_expand_alias
+++ b/Completion/Base/Completer/_expand_alias
@@ -58,7 +58,7 @@ if [[ -n $tmp ]]; then
       tmp="\\$tmp"
     fi
   fi
-  $pre _wanted aliases expl alias compadd -UQ ${tmp%%[[:blank:]]##}
+  $pre _wanted aliases expl alias compadd -UQ -- ${tmp%%[[:blank:]]##}
 elif (( $#pre )) && zstyle -t ":completion:${curcontext}:" complete; then
   $pre _aliases -s "$sel" -S ''
 else