w3m

commit e97cb2ec1a849cac2f69e407a5154a23b126d117
parent f89d6f840030fcfeecd2e8c8347396f5eb72677a
Author: inu <inu>
Date:   Mon,  4 Jun 2007 13:21:10 +0000

make number prefixes working, when vi_prec_num=0.

Diffstat:
M
ChangeLog
 | 
5
+++++
M
main.c
 | 
17
+++++------------
M
version.c.in
 | 
2
+-

3 files changed, 11 insertions(+), 13 deletions(-)
diff --git 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
diff --git a/main.c b/main.c
@@ -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
@@ -1,5 +1,5 @@
 /* $Id$ */
-#define CURRENT_VERSION "w3m/0.5.2"
+#define CURRENT_VERSION "w3m/0.5.2+cvs"
 
 #ifndef FM_H
 char *w3m_version = CURRENT_VERSION;