PATCH: Re: gcc -M<TAB>

PATCH: Re: gcc -M<TAB>

[Sven Wischnowsky]

Tanaka Akira wrote:

> Z(4):akr@serein% Src/zsh -f  
> serein% bindkey -e; autoload -U compinit; compinit -D 
> serein% gcc -M<TAB>
> _arguments:165: not an identifier: L:|-{fW}no-=-{fW} r:|[_-]=* r:|=*
> serein% gcc -M

Ahem. No good using an option for more than one purpose (-M was used
for comparguments and _argument_sets).

Oh Gott, wie peinlich.

Bye
 Sven

Index: Completion/Base/_argument_sets
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Base/_argument_sets,v
retrieving revision 1.1
diff -u -r1.1 _argument_sets
--- Completion/Base/_argument_sets	2000/04/25 09:48:09	1.1
+++ Completion/Base/_argument_sets	2000/05/09 09:49:31
@@ -20,7 +20,7 @@
 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}" )
Index: Completion/Base/_arguments
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Base/_arguments,v
retrieving revision 1.13
diff -u -r1.13 _arguments
--- Completion/Base/_arguments	2000/05/09 09:44:27	1.13
+++ Completion/Base/_arguments	2000/05/09 09:49:31
@@ -150,13 +150,13 @@
 
 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
 

--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de