isearch forward broken

isearch forward broken

[Vin Shelton]

In the latest CVS sources, isearch forward doesn't work:

zsh -f
asdf^a^sf

results in:
failing fwd-i-search: f_

I haven't noticed any problems with isearch-backward.  I'm guessing
this has something to do with wide character support.

  - Vin

Re: isearch forward broken

[Bart Schaefer]

On Mar 17,  8:39am, Vin Shelton wrote:
}
} zsh -f
} asdf^a^sf
} 
} results in:
} failing fwd-i-search: f_

I can reproduce this.  Furthermore, if you backspace to erase the f, the
entire command line is also erased.

Re: isearch forward broken

[DervishD]

    Hi Vin :)

 * Vin Shelton <acs@alumni.princeton.edu> dixit:
> In the latest CVS sources, isearch forward doesn't work:
> 
> zsh -f
> asdf^a^sf
> 
> results in:
> failing fwd-i-search: f_
> 
> I haven't noticed any problems with isearch-backward.  I'm guessing
> this has something to do with wide character support.

    Cannot reproduce this in my 4.2.4, just in case it helps to
locate when the bug got introduced.

    Raúl Núñez de Arenas Coronado

-- 
Linux Registered User 88736
http://www.dervishd.net & http://www.pleyades.net/
It's my PC and I'll cry if I want to...

Re: isearch forward broken

[Peter Stephenson]

Bart Schaefer wrote:
> On Mar 17,  8:39am, Vin Shelton wrote:
> }
> } zsh -f
> } asdf^a^sf
> } 
> } results in:
> } failing fwd-i-search: f_
> 
> I can reproduce this.  Furthermore, if you backspace to erase the f, the
> entire command line is also erased.

I'm up to date and I can't get either of these.  Failing forward
i-search when starting a shell with zsh -f isn't surprising, so I
presume there's more I don't know about.

-- 
Peter Stephenson <pws@csr.com>                  Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK                          Tel: +44 (0)1223 692070


**********************************************************************
This email and any files transmitted with it are confidential and
intended solely for the use of the individual or entity to whom they
are addressed. If you have received this email in error please notify
the system manager.

**********************************************************************

Re: isearch forward broken

[Bart Schaefer]

On Mar 18,  4:45pm, Peter Stephenson wrote:
} Subject: Re: isearch forward broken
}
} I'm up to date and I can't get either of these.  Failing forward
} i-search when starting a shell with zsh -f isn't surprising, so I
} presume there's more I don't know about.

The point is that forward i-search won't search the current buffer
any more.  Start with an empty history, type something on the current
command line, hit ctrl-a to go to the beginning of the buffer, then
try to search for something that appears in the buffer.

After it fails, backspace erases one character from the minibuffer
but also empties the entire regular buffer.

Searching the current buffer works properly in 4.2.3.

Re: isearch forward broken

[Peter Stephenson]

Bart Schaefer wrote:
> On Mar 18,  4:45pm, Peter Stephenson wrote:
> } Subject: Re: isearch forward broken
> }
> } I'm up to date and I can't get either of these.  Failing forward
> } i-search when starting a shell with zsh -f isn't surprising, so I
> } presume there's more I don't know about.
> 
> The point is that forward i-search won't search the current buffer
> any more.

Yes, looking for the right problem makes it easier.  I messed up
remember_edits().

Index: Src/Zle/zle_hist.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/zle_hist.c,v
retrieving revision 1.22
diff -u -r1.22 zle_hist.c
--- Src/Zle/zle_hist.c	25 Feb 2005 15:10:01 -0000	1.22
+++ Src/Zle/zle_hist.c	18 Mar 2005 18:19:27 -0000
@@ -107,7 +107,9 @@
 	    ZS_memcmp(ent->zle_text, zleline, zlell) != 0) {
 	    if (ent->zle_text)
 		free(ent->zle_text);
-	    ent->zle_text = stringaszleline(ent->text, &ent->zle_len, NULL);
+	    ent->zle_text = zalloc(zlell * ZLE_CHAR_SIZE);
+	    ent->zle_len = zlell;
+	    ZS_memcpy(ent->zle_text, zleline, zlell);
 	}
     }
 }

-- 
Peter Stephenson <pws@csr.com>                  Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK                          Tel: +44 (0)1223 692070


**********************************************************************
This email and any files transmitted with it are confidential and
intended solely for the use of the individual or entity to whom they
are addressed. If you have received this email in error please notify
the system manager.

**********************************************************************