make number prefixes working, when vi_prec_num=0.

3 files changed, 14 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index d4264f1..137ea56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-04  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 04271] vi_prec_num
+	* main.c: make number prefixes working when vi_prec_num=0.
+
 2007-05-31  Dai Sato <satodai@w3m.jp>
 
 	* w3m 0.5.2
@@ -8917,4 +8922,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.998 2007/05/31 12:17:05 inu Exp $
+$Id: ChangeLog,v 1.999 2007/06/04 13:21:10 inu Exp $
diff --git a/main.c b/main.c
index fed8c55..361dc20 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.258 2007/05/31 01:19:50 inu Exp $ */
+/* $Id: main.c,v 1.259 2007/06/04 13:21:10 inu Exp $ */
 #define MAINPROGRAM
 #include "fm.h"
 #include <signal.h>
@@ -1152,18 +1152,11 @@ main(int argc, char **argv, char **envp)
 	    mouse_inactive();
 #endif				/* USE_MOUSE */
 	if (IS_ASCII(c)) {	/* Ascii */
-	    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;
-		}
+	    if (('0' <= c) && (c <= '9') &&
+		(prec_num || (GlobalKeymap[c] == FUNCNAME_nulcmd))) {
+		prec_num = prec_num * 10 + (int)(c - '0');
+		if (prec_num > PREC_LIMIT)
+		   prec_num = PREC_LIMIT;
 	    }
 	    else {
 		set_buffer_environ(Currentbuf);
diff --git a/version.c.in b/version.c.in
index 76501b3..5b3615d 100644
--- a/version.c.in
+++ b/version.c.in
@@ -1,5 +1,5 @@
-/* $Id: version.c.in,v 1.46 2007/05/31 12:17:05 inu Exp $ */
-#define CURRENT_VERSION "w3m/0.5.2"
+/* $Id: version.c.in,v 1.47 2007/06/04 13:21:10 inu Exp $ */
+#define CURRENT_VERSION "w3m/0.5.2+cvs"
 
 #ifndef FM_H
 char *w3m_version = CURRENT_VERSION;