aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDai Sato <satodai@w3m.jp>2006-04-08 11:21:07 +0000
committerDai Sato <satodai@w3m.jp>2006-04-08 11:21:07 +0000
commitdd7ae6dfb818cc2ac292a78a6aa995c13efbebdf (patch)
treecd2c8e532358ad2e2eac07924d59b79ea6366cb0
parent[w3m-dev 04146] disable HAVE_LANGINFO_CODESET on cygwin (diff)
downloadw3m-dd7ae6dfb818cc2ac292a78a6aa995c13efbebdf.tar.gz
w3m-dd7ae6dfb818cc2ac292a78a6aa995c13efbebdf.zip
[w3m-dev 04150] fix vi_prec_num switching.
-rw-r--r--ChangeLog9
-rw-r--r--main.c18
2 files changed, 20 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index cfc7250..6e11e1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2006-04-07 Dai Sato <satodai@w3m.jp>
+2006-04-08 Dai Sato <satodai@w3m.jp>
+
+ * [w3m-dev 04150] vi-prec_num
+ * main.c: fix vi_prec_num switching.
+
+2006-04-08 Dai Sato <satodai@w3m.jp>
* [w3m-dev 04146] disable HAVE_LANGINFO_CODESET on cygwin
* configure.ac: avoid AM_LANGINFO_CODESET check for Cygwin.
@@ -8688,4 +8693,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.956 2006/04/08 11:15:57 inu Exp $
+$Id: ChangeLog,v 1.957 2006/04/08 11:21:07 inu Exp $
diff --git a/main.c b/main.c
index fa37951..19f29b2 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.249 2006/04/07 13:21:11 inu Exp $ */
+/* $Id: main.c,v 1.250 2006/04/08 11:21:07 inu Exp $ */
#define MAINPROGRAM
#include "fm.h"
#include <signal.h>
@@ -1112,10 +1112,18 @@ main(int argc, char **argv, char **envp)
mouse_inactive();
#endif /* USE_MOUSE */
if (IS_ASCII(c)) { /* Ascii */
- if (((prec_num && c == '0') || '1' <= c) && (c <= '9')) {
- prec_num = prec_num * 10 + (int)(c - '0');
- if (prec_num > PREC_LIMIT)
- prec_num = PREC_LIMIT;
+ if( vi_prec_num ){
+ if(((prec_num && c == '0') || '1' <= c) && (c <= '9')) {
+ prec_num = prec_num * 10 + (int)(c - '0');
+ if (prec_num > PREC_LIMIT)
+ prec_num = PREC_LIMIT;
+ }
+ else {
+ set_buffer_environ(Currentbuf);
+ save_buffer_position(Currentbuf);
+ keyPressEventProc((int)c);
+ prec_num = 0;
+ }
}
else {
set_buffer_environ(Currentbuf);