github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-23 10:00:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't reset history on cursor movement

Browse Source 
darcs-hash:20060201155546-ac50b-975730e850775a9f47e15a65c9c5959a335edc93.gz
This commit is contained in:
axel 2006-02-02 01:55:46 +10:00
parent a781736fb7
commit 5942a6d6c1
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
reader.c
View File

@ -2641,7 +2641,10 @@ wchar_t *reader_readline()
case R_HISTORY_SEARCH_BACKWARD: case R_HISTORY_SEARCH_BACKWARD:
{ {
if( (last_char != R_HISTORY_SEARCH_BACKWARD) && if( (last_char != R_HISTORY_SEARCH_BACKWARD) &&
(last_char != R_HISTORY_SEARCH_FORWARD) ) (last_char != R_HISTORY_SEARCH_FORWARD) &&
(last_char != R_FORWARD_CHAR) &&
(last_char != R_BACKWARD_CHAR) )
{ {
wcscpy(data->search_buff, data->buff ); wcscpy(data->search_buff, data->buff );
data->search_buff[data->buff_pos]=0; data->search_buff[data->buff_pos]=0;
@ -2655,7 +2658,9 @@ wchar_t *reader_readline()
case R_HISTORY_SEARCH_FORWARD: case R_HISTORY_SEARCH_FORWARD:
{ {
if( (last_char != R_HISTORY_SEARCH_BACKWARD) && if( (last_char != R_HISTORY_SEARCH_BACKWARD) &&
(last_char != R_HISTORY_SEARCH_FORWARD) ) (last_char != R_HISTORY_SEARCH_FORWARD) &&
(last_char != R_FORWARD_CHAR) &&
(last_char != R_BACKWARD_CHAR) )
{ {
wcscpy(data->search_buff, data->buff ); wcscpy(data->search_buff, data->buff );
data->search_buff[data->buff_pos]=0; data->search_buff[data->buff_pos]=0;
@ -2808,7 +2813,9 @@ wchar_t *reader_readline()
if( (c != R_HISTORY_SEARCH_BACKWARD) && if( (c != R_HISTORY_SEARCH_BACKWARD) &&
(c != R_HISTORY_SEARCH_FORWARD) && (c != R_HISTORY_SEARCH_FORWARD) &&
(c != R_HISTORY_TOKEN_SEARCH_BACKWARD) && (c != R_HISTORY_TOKEN_SEARCH_BACKWARD) &&
(c != R_HISTORY_TOKEN_SEARCH_FORWARD) ) (c != R_HISTORY_TOKEN_SEARCH_FORWARD) &&
(c != R_FORWARD_CHAR) &&
(c != R_BACKWARD_CHAR) )
{ {
data->search_buff[0]=0; data->search_buff[0]=0;
history_reset(); history_reset();