Re: PATCH: was: Re: zsh bug

Re: PATCH: was: Re: zsh bug

[Sven Wischnowsky]

I wrote this patch:

> --- Src/zle_tricky.c	Tue May 25 10:32:35 1999
> +++ Src/zle_tricky.c.old	Mon May 10 13:21:55 1999
> @@ -1069,14 +1069,13 @@
>  	    we = ll;
>  	tt = (char *)line;
>  	if (tmp) {
> -	    linptr += tmp - (char *) line;
>  	    line = (unsigned char *)tmp;
>  	    ll = strlen((char *)line);
> -	    addedx = 0;
>  	}
>  	if (t0 != STRING && inwhat != IN_MATH) {
>  	    if (tmp) {
>  		tmp = NULL;
> +		linptr = (char *)line;
>  		lexrestore();
>  		goto start;
>  	    }

Err, Bart, Greg: sorry, but this patch is reversed, dunno how this
happened. Here is it the right way round.

Bye
 Sven

--- Src/zle_tricky.c.old	Mon May 10 13:21:55 1999
+++ Src/zle_tricky.c	Tue May 25 10:32:35 1999
@@ -1069,13 +1069,14 @@
 	    we = ll;
 	tt = (char *)line;
 	if (tmp) {
+	    linptr += tmp - (char *) line;
 	    line = (unsigned char *)tmp;
 	    ll = strlen((char *)line);
+	    addedx = 0;
 	}
 	if (t0 != STRING && inwhat != IN_MATH) {
 	    if (tmp) {
 		tmp = NULL;
-		linptr = (char *)line;
 		lexrestore();
 		goto start;
 	    }

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

PATCH: was: Re: zsh bug

[Sven Wischnowsky]

Glenn Trigg wrote:

> The wierd behaviour happens when I do the following:
> 
> kill -1 $(cat /var/run/ine
> 
> when I hit tab there, the line completes as:
> 
> kill -1 $(cat /var/run/ineetd.pid
> 
> I.e I get the extra letter which is the letter at the end when I hit
> tab.

This patch is for my modified 3.0.6. The problem was that 1) it didn't 
remember that on the first run through the loop in get_comp_string()
the addedx was removed and that it didn't use the linptr it had
modified for the second run.

This isn't needed for 3.1.5 because there I cleaned up handling of
$(...) some time ago (and for other reasons).

Bye
 Sven

--- Src/zle_tricky.c	Tue May 25 10:32:35 1999
+++ Src/zle_tricky.c.old	Mon May 10 13:21:55 1999
@@ -1069,14 +1069,13 @@
 	    we = ll;
 	tt = (char *)line;
 	if (tmp) {
-	    linptr += tmp - (char *) line;
 	    line = (unsigned char *)tmp;
 	    ll = strlen((char *)line);
-	    addedx = 0;
 	}
 	if (t0 != STRING && inwhat != IN_MATH) {
 	    if (tmp) {
 		tmp = NULL;
+		linptr = (char *)line;
 		lexrestore();
 		goto start;
 	    }

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