From 5942a6d6c193f6d985d9f4eaada7c8113a40d1c0 Mon Sep 17 00:00:00 2001 From: axel Date: Thu, 2 Feb 2006 01:55:46 +1000 Subject: [PATCH] Don't reset history on cursor movement darcs-hash:20060201155546-ac50b-975730e850775a9f47e15a65c9c5959a335edc93.gz --- reader.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/reader.c b/reader.c index 6f8d2439b..f4d17d283 100644 --- a/reader.c +++ b/reader.c @@ -2641,7 +2641,10 @@ wchar_t *reader_readline() case 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 ); data->search_buff[data->buff_pos]=0; @@ -2655,7 +2658,9 @@ wchar_t *reader_readline() case R_HISTORY_SEARCH_FORWARD: { 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 ); data->search_buff[data->buff_pos]=0; @@ -2808,7 +2813,9 @@ wchar_t *reader_readline() if( (c != R_HISTORY_SEARCH_BACKWARD) && (c != R_HISTORY_SEARCH_FORWARD) && (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; history_reset();