rpms/xemacs-sumo/devel xemacs-sumo-java-fontlock.patch, 1.1, 1.2 xemacs-sumo.spec, 1.6, 1.7

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8780

Modified Files:
	xemacs-sumo-java-fontlock.patch xemacs-sumo.spec 
Log Message:
Improved upstream patch against JDE font-lock warnings.

xemacs-sumo-java-fontlock.patch:

Index: xemacs-sumo-java-fontlock.patch
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo-java-fontlock.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xemacs-sumo-java-fontlock.patch	8 May 2005 17:13:23 -0000	1.1
+++ xemacs-sumo-java-fontlock.patch	24 May 2005 15:37:14 -0000	1.2
@@ -1,14 +1,11 @@
-http://list-archive.xemacs.org/xemacs-patches/200503/msg00230.html
-
---- xemacs-packages/lisp/cc-mode/cc-engine.el~	2004-08-12 08:44:10.000000000 +0300
-+++ xemacs-packages/lisp/cc-mode/cc-engine.el	2005-05-01 23:20:43.000000000 +0300
-@@ -2446,7 +2446,8 @@
- 	    (and
- 	     (progn
- 	       (setq search-pos (point))
--	       (re-search-forward regexp bound noerror))
-+	       (if (>= bound (point))
-+		   (re-search-forward regexp bound noerror)))
- 
- 	     (progn
- 	       (setq state (parse-partial-sexp
+--- xemacs-packages/lisp/cc-mode/cc-fonts.el	11 Aug 2004 16:30:15 -0000	1.5
++++ xemacs-packages/lisp/cc-mode/cc-fonts.el	23 May 2005 00:09:39 -0000	1.7
+@@ -867,7 +867,7 @@
+ 	       ;; with array initializers.  Otherwise stop at braces
+ 	       ;; to avoid going past full function and class blocks.
+ 	       (and (if (and (eq got-init ?=)
+-			     (= (c-forward-token-2) 0)
++			     (= (c-forward-token-2 1 nil limit) 0)
+ 			     (looking-at "{"))
+ 			(c-safe (c-forward-sexp) t)
+ 		      t)


Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xemacs-sumo.spec	20 May 2005 15:43:48 -0000	1.6
+++ xemacs-sumo.spec	24 May 2005 15:37:14 -0000	1.7
@@ -3,7 +3,7 @@
 Summary: XEmacs Lisp packages
 Name: xemacs-sumo
 Version: %(echo %{sumo_ver} | tr -d -)
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Editors
 Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo_ver}.tar.bz2
@@ -194,6 +194,9 @@
 
 
 %changelog
+* Tue May 24 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050505-3
+- Apply improved upstream patch against JDE font-lock warnings.
+
 * Fri May 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050505-2
 - Apply upstream patch to fix abbrev error when loading sql-mode.