about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Base/_argument_sets2
-rw-r--r--Completion/Base/_arguments6
3 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d5b3faac4..b600d1eb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-05-09  Sven Wischnowsky  <wischnow@zsh.org>
 
+	* 11273: Completion/Base/_argument_sets,
+ 	Completion/Base/_arguments: option name clash in _arguments
+	
 	* 11272: Completion/Base/_arguments: fix for _arguments without
  	options and no more arguments to complete
 	
diff --git a/Completion/Base/_argument_sets b/Completion/Base/_argument_sets
index ad59effdc..5218fef69 100644
--- a/Completion/Base/_argument_sets
+++ b/Completion/Base/_argument_sets
@@ -20,7 +20,7 @@ ocontext=()
 while true; do
   end=$argv[(i)-]
 
-  _arguments -M xor "$1" "$all[@]" "${(@)argv[2,end-1]}"
+  _arguments -m xor "$1" "$all[@]" "${(@)argv[2,end-1]}"
   r=$?
 
   oopt_args=( "$oopt_args[@]" "${(kv)opt_args}" )
diff --git a/Completion/Base/_arguments b/Completion/Base/_arguments
index 7be7bef8c..0637b2cd5 100644
--- a/Completion/Base/_arguments
+++ b/Completion/Base/_arguments
@@ -150,13 +150,13 @@ fi
 
 multi=(-i)
 subopts=()
-while [[ "$1" = -(O*|C|M*) ]]; do
+while [[ "$1" = -(O*|C|m*) ]]; do
   case "$1" in
   -C) usecc=yes; shift ;;
   -O) subopts=( "${(@P)2}" ); shift 2 ;;
   -O*)  subopts=( "${(@P)1[3,-1]}" ); shift ;;
-  -M) ismulti=yes multi=(-I "$2" "$3"); shift 3 ;;
-  -M*) ismulti=yes multi=(-I "${1[3,-1]}" "$2"); shift 2 ;;
+  -m) ismulti=yes multi=(-I "$2" "$3"); shift 3 ;;
+  -m*) ismulti=yes multi=(-I "${1[3,-1]}" "$2"); shift 2 ;;
   esac
 done