aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2002-01-31 04:49:42 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2002-01-31 04:49:42 +0000
commit046764cde830a3065e6d9b1ef5924bdcea71e505 (patch)
treecc5853e65e4c5b82d219e18a4a8abc3975c7f247
parent[w3m-dev 02946] toggle migemo (diff)
downloadw3m-046764cde830a3065e6d9b1ef5924bdcea71e505.tar.gz
w3m-046764cde830a3065e6d9b1ef5924bdcea71e505.zip
[w3m-dev 02949] fix for #undef USE_MIGEMO
* main.c (dispincsrch): need #ifdef USE_MIGEMO From: Fumitoshi UKAI <ukai@debian.or.jp>
-rw-r--r--ChangeLog7
-rw-r--r--main.c19
2 files changed, 16 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 60be9fd..9d8c6c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-31 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * [w3m-dev 02949] fix for #undef USE_MIGEMO
+ * main.c (dispincsrch): need #ifdef USE_MIGEMO
+
2002-01-31 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev 02946] toggle migemo
@@ -2457,4 +2462,4 @@
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.280 2002/01/31 03:55:35 ukai Exp $
+$Id: ChangeLog,v 1.281 2002/01/31 04:49:42 ukai Exp $
diff --git a/main.c b/main.c
index fcebbce..d8ec266 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.75 2002/01/31 03:55:35 ukai Exp $ */
+/* $Id: main.c,v 1.76 2002/01/31 04:49:42 ukai Exp $ */
#define MAINPROGRAM
#include "fm.h"
#include <signal.h>
@@ -1427,9 +1427,11 @@ dispincsrch(int ch, Str buf, Lineprop *prop)
do_next_search = TRUE;
break;
+#ifdef USE_MIGEMO
case 034:
migemo_active = -migemo_active;
goto done;
+#endif
default:
if (ch >= 0)
@@ -1464,16 +1466,15 @@ dispincsrch(int ch, Str buf, Lineprop *prop)
}
displayBuffer(Currentbuf, B_FORCE_REDRAW);
clear_mark(Currentbuf->currentLine);
+#ifdef USE_MIGEMO
done:
- {
- int i;
- for (i = 0; str[i] != '\0'; i++) {
- if (migemo_active > 0)
- prop[i] |= PE_UNDER;
- else
- prop[i] &= ~PE_UNDER;
- }
+ while (*str++ != '\0') {
+ if (migemo_active > 0)
+ *prop++ |= PE_UNDER;
+ else
+ *prop++ &= ~PE_UNDER;
}
+#endif
return -1;
}