Zsh Mailing List Archive Messages sorted by: Reverse Date, Date, Thread, Author

Re: help with _match, globcomplete etc. (with PATCH)

X-seq: zsh-workers 9722
From: Sven Wischnowsky <wischnow@xxxxxxxxxxxxxxxxxxxxxxx>
To: zsh-workers@xxxxxxxxxxxxxx
Subject: Re: help with _match, globcomplete etc. (with PATCH)
Date: Mon, 14 Feb 2000 14:07:34 +0100 (MET)
In-reply-to: Sven Wischnowsky's message of Mon, 14 Feb 2000 14:03:25 +0100 (MET)
Mailing-list: contact zsh-workers-help@xxxxxxxxxxxxxx; run by ezmlm

Err, sorry. Here is the patch.

Bye
 Sven

diff -ru ../z.old/Completion/Commands/_expand_word Completion/Commands/_expand_word
--- ../z.old/Completion/Commands/_expand_word	Mon Feb 14 11:54:38 2000
+++ Completion/Commands/_expand_word	Mon Feb 14 13:38:48 2000
@@ -8,7 +8,7 @@
 local curcontext="$curcontext"
 
 if [[ -z "$curcontext" ]]; then
-  curcontext="correct-word:::"
+  curcontext="expand-word:::"
 else
   curcontext="expand-word:${curcontext#*:}"
 fi
diff -ru ../z.old/Src/Zle/compcore.c Src/Zle/compcore.c
--- ../z.old/Src/Zle/compcore.c	Mon Feb 14 11:54:13 2000
+++ Src/Zle/compcore.c	Mon Feb 14 13:56:53 2000
@@ -295,10 +295,10 @@
 	haspattern = 0;
 	complistmax = getiparam("LISTMAX");
 	zsfree(complastprompt);
-	complastprompt = ztrdup((dolastprompt =
-				 ((isset(ALWAYSLASTPROMPT) && zmult == 1) ||
-				  (unset(ALWAYSLASTPROMPT) && zmult != 1))) ?
+	complastprompt = ztrdup(((isset(ALWAYSLASTPROMPT) && zmult == 1) ||
+				 (unset(ALWAYSLASTPROMPT) && zmult != 1)) ?
 				"yes" : "");
+	dolastprompt = 1;
 	zsfree(complist);
 	complist = ztrdup(isset(LISTROWSFIRST) ?
 			  (isset(LISTPACKED) ? "packed rows" : "rows") :
diff -ru ../z.old/Src/Zle/complist.c Src/Zle/complist.c
--- ../z.old/Src/Zle/complist.c	Mon Feb 14 11:54:13 2000
+++ Src/Zle/complist.c	Mon Feb 14 13:58:42 2000
@@ -780,7 +780,7 @@
     if (inselect)
 	clearflag = 0;
 
-    if (asklist()) {
+    if (asklist() || !clearflag) {
 	amatches = oamatches;
 	return (noselect = 1);
     }

--
Sven Wischnowsky                         wischnow@xxxxxxxxxxxxxxxxxxxxxxx

Messages sorted by: Reverse Date, Date, Thread, Author