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

Re: PATCH: completions for su and implicit fg/bg

X-seq: zsh-workers 7105
From: Sven Wischnowsky <wischnow@xxxxxxxxxxxxxxxxxxxxxxx>
To: zsh-workers@xxxxxxxxxxxxxx
Subject: Re: PATCH: completions for su and implicit fg/bg
Date: Tue, 13 Jul 1999 11:02:29 +0200 (MET DST)
In-reply-to: Peter Stephenson's message of Mon, 12 Jul 1999 16:29:10 +0200
Mailing-list: contact zsh-workers-help@xxxxxxxxxxxxxx; run by ezmlm

Peter Stephenson wrote:

> OK, the next problem seems to be that using ^D removes the quotes, although
> other completion functions don't.  I'm using

Oops. Forgot to restore the command line in two cases where it isn't
expected to change.

Bye
 Sven

diff -u os/Zle/zle_tricky.c Src/Zle/zle_tricky.c
--- os/Zle/zle_tricky.c	Tue Jul 13 10:59:34 1999
+++ Src/Zle/zle_tricky.c	Tue Jul 13 10:59:52 1999
@@ -4380,10 +4380,14 @@
 	}
 	if (comppatmatch && *comppatmatch && comppatmatch != opm)
 	    haspattern = 1;
-	if (!useline && uselist)
+	if (!useline && uselist) {
 	    /* All this and the guy only wants to see the list, sigh. */
+	    cs = 0;
+	    foredel(ll);
+	    inststr(origline);
+	    cs = origcs;
 	    showinglist = -2;
-	else if (useline) {
+	} else if (useline) {
 	    /* We have matches. */
 	    if (nmatches > 1) {
 		/* There is more than one match. */
@@ -4399,9 +4403,13 @@
 		do_single(m->matches[0]);
 		invalidatelist();
 	    }
-	} else
+	} else {
 	    invalidatelist();
-
+	    cs = 0;
+	    foredel(ll);
+	    inststr(origline);
+	    cs = origcs;
+	}
 	/* Print the explanation strings if needed. */
 	if (!showinglist && validlist && usemenu != 2 && nmatches != 1) {
 	    Cmgroup g = amatches;

--
Sven Wischnowsky                         wischnow@xxxxxxxxxxxxxxxxxxxxxxx

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