rpms/xemacs-sumo/devel xemacs-sumo-jde-equal.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xemacs-sumo.spec, 1.7, 1.8 xemacs-sumo-java-fontlock.patch, 1.2, NONE

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	.cvsignore sources xemacs-sumo.spec 
Added Files:
	xemacs-sumo-jde-equal.patch 
Removed Files:
	xemacs-sumo-java-fontlock.patch 
Log Message:
Fully import new cc-mode, one more JDEE warning fix.

xemacs-sumo-jde-equal.patch:

--- NEW FILE xemacs-sumo-jde-equal.patch ---
--- xemacs-packages/lisp/jde/jde-java-font-lock.el	18 Jan 2003 05:48:45 -0000	1.8
+++ xemacs-packages/lisp/jde/jde-java-font-lock.el	1 Jun 2005 19:33:58 -0000
@@ -791,13 +791,13 @@
      ;; Fontify import directives
      '("\\<\\(import\\)\\>\\s-+\\(\\sw+\\)"
        (1 font-lock-keyword-face)
-       (2 (if (char-equal (char-after (match-end 0)) ?\.)
+       (2 (if (equal (char-after (match-end 0)) ?\.)
               'jde-java-font-lock-package-face
             'font-lock-type-face))
        ("\\=\\.\\(\\*\\|\\sw+\\)" nil nil
-        (1 (if (char-equal (char-after (match-end 0)) ?\.)
+        (1 (if (equal (char-after (match-end 0)) ?\.)
                'jde-java-font-lock-package-face
-             (if (char-equal (char-before (match-end 0)) ?\*)
+             (if (equal (char-before (match-end 0)) ?\*)
                  'jde-java-font-lock-number-face
                'font-lock-type-face)))))
      )


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 May 2005 17:13:23 -0000	1.4
+++ .cvsignore	1 Jun 2005 21:00:01 -0000	1.5
@@ -1,2 +1,3 @@
 xemacs-mule-sumo-2005-05-05.tar.bz2
 xemacs-sumo-2005-05-05.tar.bz2
+cc-mode-1.45-pkg.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 May 2005 17:13:23 -0000	1.4
+++ sources	1 Jun 2005 21:00:01 -0000	1.5
@@ -1,2 +1,3 @@
 561bac71479bc400173c21c854c37beb  xemacs-mule-sumo-2005-05-05.tar.bz2
 f98700b3db3ce279fe2c4234806f7dfa  xemacs-sumo-2005-05-05.tar.bz2
+e1a2e251e57f29ce6e082181c13c7f04  cc-mode-1.45-pkg.tar.gz


Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xemacs-sumo.spec	24 May 2005 15:37:14 -0000	1.7
+++ xemacs-sumo.spec	1 Jun 2005 21:00:01 -0000	1.8
@@ -3,12 +3,13 @@
 Summary: XEmacs Lisp packages
 Name: xemacs-sumo
 Version: %(echo %{sumo_ver} | tr -d -)
-Release: 3
+Release: 5
 License: GPL
 Group: Applications/Editors
 Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo_ver}.tar.bz2
 Source1: ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo_ver}.tar.bz2
 Source2: %{name}-w3.css
+Source3: ftp://ftp.xemacs.org/beta/experimental/packages/cc-mode-1.45-pkg.tar.gz
 Source10: Emacs.ad.ja_JP.eucJP
 Source11: Emacs.ad.ko_KR.eucKR
 Source12: Emacs.ad.zh_CN.GB2312
@@ -32,7 +33,7 @@
 # anyway to for the sake of smooth upgrades.
 Provides: apel-xemacs = 10.2 mew-xemacs = 1.94.2
 Obsoletes: apel-xemacs < 10.6-6 mew-xemacs < 4.1-2 ddskk-xemacs < 12.2.0-5
-Patch0: %{name}-java-fontlock.patch
+Patch0: %{name}-jde-equal.patch
 Patch1: %{name}-sql-abbrev.patch
 Patch6: auctex-texsite-jlatex-detect-69129.patch
 Patch7: auctex-texjp-platex.patch
@@ -82,7 +83,8 @@
 %define pkgdir %{_datadir}/xemacs
 
 %prep
-%setup -q -c xemacs-sumo-%{version} -a1
+%setup -q -c -a1
+%{__tar} zx -C xemacs-packages -f %{SOURCE3}
 # fix font-lock warnings in JDE
 %patch0 -p0
 # fix abbrev error when loading sql-mode
@@ -194,6 +196,10 @@
 
 
 %changelog
+* Wed Jun  1 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050505-5
+- Bundle upstream cc-mode package version 1.45 (contains cc-mode 5.30.10).
+- Fix JDEE font-lock warnings with import statements.
+
 * Tue May 24 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050505-3
 - Apply improved upstream patch against JDE font-lock warnings.
 


--- xemacs-sumo-java-fontlock.patch DELETED ---