diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | linein.c | 4 | ||||
| -rw-r--r-- | main.c | 10 |
3 files changed, 10 insertions, 12 deletions
@@ -1,3 +1,9 @@ +2003-04-15 Masanori Kobayasi <zap03216@nifty.ne.jp> + + * [w3m-dev 03878] I-search problem + * linein.c (inputLineHistSearch): don't call incrfunc twice + * main.c (dispincsrch): fix search loop problem + 2003-04-14 Fumitoshi UKAI <ukai@debian.or.jp> * [w3m-dev 03875] Re: SSL & compressed stream @@ -7745,4 +7751,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.824 2003/04/14 03:29:37 ukai Exp $ +$Id: ChangeLog,v 1.825 2003/04/14 16:19:27 ukai Exp $ @@ -1,4 +1,4 @@ -/* $Id: linein.c,v 1.30 2003/04/06 16:27:54 ukai Exp $ */ +/* $Id: linein.c,v 1.31 2003/04/14 16:19:28 ukai Exp $ */ #include "fm.h" #include "local.h" #include "myctype.h" @@ -226,7 +226,7 @@ inputLineHistSearch(char *prompt, char *def_str, int flag, Hist *hist, if (incrfunc == NULL || (c = incrfunc((int)c, strBuf, strProp)) < 0x20) (*InputKeymap[(int)c]) (c); - if (incrfunc) + if (incrfunc && c != (unsigned char)-1 && c != CTRL_J) incrfunc(-1, strBuf, strProp); if (cm_clear) cm_next = FALSE; @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.222 2003/04/08 16:01:39 ukai Exp $ */ +/* $Id: main.c,v 1.223 2003/04/14 16:19:29 ukai Exp $ */ #define MAINPROGRAM #include "fm.h" #include <signal.h> @@ -1628,14 +1628,6 @@ dispincsrch(int ch, Str buf, Lineprop *prop) SAVE_BUFPOSITION(&sbuf); srchcore(str, searchRoutine); arrangeCursor(Currentbuf); - if (Currentbuf->currentLine == currentLine - && Currentbuf->pos == pos) { - SAVE_BUFPOSITION(&sbuf); - if (searchRoutine == forwardSearch) - Currentbuf->pos += 1; - srchcore(str, searchRoutine); - arrangeCursor(Currentbuf); - } displayBuffer(Currentbuf, B_FORCE_REDRAW); clear_mark(Currentbuf->currentLine); return -1; |