Re: About the new long/short options changes

[Sven Wischnowsky <wischnow@informatik.hu-berlin.de>]

Two last bits of cleanup.

First, we need compgroups to add empty groups in a different order.  I'm
not too happy about hardcoding that (although the patch makes it most to
least `special', so to say, so it almost makes sense), maybe I'll add
options to say in which order they should be defined if I ever think
it's too weird.

Second, trying `gzip <TAB>' with `prefix-needed == false' didn't show
files because of the return value of _arguments.  We've (ok: I) changed
this several times now and can only hope it doesn't interfere with other
complicated functions using _arguments.


Bye
  Sven

Index: Completion/Base/Utility/_arguments
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Base/Utility/_arguments,v
retrieving revision 1.8
diff -u -r1.8 _arguments
--- Completion/Base/Utility/_arguments	2001/06/06 09:31:54	1.8
+++ Completion/Base/Utility/_arguments	2001/07/30 08:16:49
@@ -428,6 +428,8 @@
 
   if [[ -n "$aret" ]]; then
     [[ -n $rawret ]] && return 300
+
+    return 1
   else
     [[ -n "$noargs" && nm -eq "$compstate[nmatches]" ]] && _message "$noargs"
   fi
Index: Src/Zle/computil.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/computil.c,v
retrieving revision 1.70
diff -u -r1.70 computil.c
--- Src/Zle/computil.c	2001/07/27 12:56:57	1.70
+++ Src/Zle/computil.c	2001/07/30 08:16:50
@@ -4281,9 +4281,7 @@
     SWITCHHEAPS(oldheap, compheap) {
 	while ((n = *args++)) {
 	    endcmgroup(NULL);
-	    begcmgroup(n, 0);
-	    endcmgroup(NULL);
-	    begcmgroup(n, CGF_NOSORT);
+	    begcmgroup(n, CGF_NOSORT|CGF_UNIQCON);
 	    endcmgroup(NULL);
 	    begcmgroup(n, CGF_UNIQALL);
 	    endcmgroup(NULL);
@@ -4291,7 +4289,9 @@
 	    endcmgroup(NULL);
 	    begcmgroup(n, CGF_UNIQALL);
 	    endcmgroup(NULL);
-	    begcmgroup(n, CGF_NOSORT|CGF_UNIQCON);
+	    begcmgroup(n, CGF_NOSORT);
+	    endcmgroup(NULL);
+	    begcmgroup(n, 0);
 	}
     } SWITCHBACKHEAPS(oldheap);
 

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