aboutsummaryrefslogtreecommitdiffstats
path: root/main.c
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2002-01-16 16:11:35 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2002-01-16 16:11:35 +0000
commitd4cc6b84dcb6704de0b5cb251fc71b188b1180e6 (patch)
tree7296753d266e2f1ceec8fef8ef7d4638428cbdf2 /main.c
parent[w3m-dev 02854] highlight for incremental search (diff)
downloadw3m-d4cc6b84dcb6704de0b5cb251fc71b188b1180e6.tar.gz
w3m-d4cc6b84dcb6704de0b5cb251fc71b188b1180e6.zip
[w3m-dev 02855]
* main.c (dispincsrch): for C-s C-s, revert some changes From: Fumitoshi UKAI <ukai@debian.or.jp>
Diffstat (limited to '')
-rw-r--r--main.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/main.c b/main.c
index 8178718..afc3184 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.60 2002/01/16 15:37:06 ukai Exp $ */
+/* $Id: main.c,v 1.61 2002/01/16 16:11:38 ukai Exp $ */
#define MAINPROGRAM
#include "fm.h"
#include <signal.h>
@@ -1432,8 +1432,8 @@ dispincsrch(int ch, Str buf)
}
if (do_next_search) {
- SAVE_BUFPOSITION(&sbuf);
if (*str) {
+ SAVE_BUFPOSITION(&sbuf);
srchcore(str, searchRoutine);
arrangeCursor(Currentbuf);
if (Currentbuf->currentLine == currentLine
@@ -1442,15 +1442,18 @@ dispincsrch(int ch, Str buf)
srchcore(str, searchRoutine);
arrangeCursor(Currentbuf);
}
+ displayBuffer(Currentbuf, B_FORCE_REDRAW);
+ clear_mark(Currentbuf->currentLine);
+ return -1;
}
+ else
+ return 020; /* _prev completion for C-s C-s */
}
- else {
+ else if (*str) {
RESTORE_BUFPOSITION(&sbuf);
arrangeCursor(Currentbuf);
- if (*str) {
- srchcore(str, searchRoutine);
- arrangeCursor(Currentbuf);
- }
+ srchcore(str, searchRoutine);
+ arrangeCursor(Currentbuf);
currentLine = Currentbuf->currentLine;
pos = Currentbuf->pos;
}