rpms/w3m/devel w3m-fix-vi-prec-num.patch, NONE, 1.1 w3m.spec, 1.27, 1.28 gc6.2-fix-prelink.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: tagoh

Update of /cvs/dist/rpms/w3m/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12543

Modified Files:
	w3m.spec 
Added Files:
	w3m-fix-vi-prec-num.patch 
Removed Files:
	gc6.2-fix-prelink.patch 
Log Message:
* Wed Nov  9 2005 Akira TAGOH <tagoh at redhat.com> 0.5.1-12
- rebuilt against the latest openssl.
- gc6.2-fix-prelink.patch: removed.
- w3m-fix-vi-prec-num.patch: applied to get the vi-like prefix working.

w3m-fix-vi-prec-num.patch:
 main.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

--- NEW FILE w3m-fix-vi-prec-num.patch ---
diff -ruN w3m-0.5.1.orig/main.c w3m-0.5.1/main.c
--- w3m-0.5.1.orig/main.c	2005-11-09 23:07:27.000000000 +0900
+++ w3m-0.5.1/main.c	2005-11-09 23:12:00.000000000 +0900
@@ -1112,10 +1112,18 @@
 	    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);


Index: w3m.spec
===================================================================
RCS file: /cvs/dist/rpms/w3m/devel/w3m.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- w3m.spec	10 May 2005 13:26:50 -0000	1.27
+++ w3m.spec	9 Nov 2005 15:29:22 -0000	1.28
@@ -4,7 +4,7 @@
 
 Name:		w3m
 Version:	0.5.1
-Release: 11
+Release: 12
 License:	BSD
 URL:		http://w3m.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
@@ -29,9 +29,9 @@
 ## fix patch
 Patch15:	w3m-0.4.1-helpcharset.patch
 Patch17:	w3m-0.5-static-libgc.patch
-Patch20:	gc6.2-fix-prelink.patch
 Patch21:	w3m-0.5.1-gcc4.patch
 Patch22:	w3m-cvs-20050328.patch
+Patch23:	w3m-fix-vi-prec-num.patch
 
 
 Summary:	A pager with Web browsing abilities.
@@ -69,21 +69,18 @@
 %patch17 -p1
 %patch21 -p1
 %patch22 -p0
+%patch23 -p1
 
 rm -rf gc
 tar xfz %{SOURCE20}
 mv %{gcversion} gc
-(cd gc;
-%patch20 -p1
-)
-#%patch11 -p1
 
 %build
-(cd gc;
+pushd gc
 make gc.a
 mkdir lib
 ln -s ../gc.a lib/libgc.a
-)
+popd
 %configure	%{build_options} \
 		%{?_without_nntp:--disable-nntp} \
 		%{!?_without_nntp:--enable-nntp} \
@@ -131,6 +128,11 @@
 %{_libexecdir}/w3m/w3mimgdisplay
 
 %changelog
+* Wed Nov  9 2005 Akira TAGOH <tagoh at redhat.com> 0.5.1-12
+- rebuilt against the latest openssl.
+- gc6.2-fix-prelink.patch: removed.
+- w3m-fix-vi-prec-num.patch: applied to get the vi-like prefix working.
+
 * Tue May 10 2005 Joe Orton <jorton at redhat.com> 0.5.1-11
 - point at certs directory in /etc/pki
 


--- gc6.2-fix-prelink.patch DELETED ---