rpms/xemacs-sumo/devel xemacs-sumo-sql-abbrev.patch, NONE, 1.1 xemacs-sumo.spec, 1.5, 1.6

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	xemacs-sumo.spec 
Added Files:
	xemacs-sumo-sql-abbrev.patch 
Log Message:
Fix abbrev error when loading sql-mode.

xemacs-sumo-sql-abbrev.patch:

--- NEW FILE xemacs-sumo-sql-abbrev.patch ---
http://list-archive.xemacs.org/xemacs-beta/200505/msg00111.html
http://list-archive.xemacs.org/xemacs-patches/200505/msg00101.html

--- xemacs-packages/lisp/prog-modes/sql.el	19 Apr 2005 13:15:40 -0000	1.18
+++ xemacs-packages/lisp/prog-modes/sql.el	20 May 2005 12:12:18 -0000	1.19
@@ -844,7 +844,7 @@
     ;; In Emacs 21.3+, provide SYSTEM-FLAG to define-abbrev.
    '(lambda (abbrev)
       (let ((name (car abbrev))
-	    (expansion (cdr abbrev)))
+	    (expansion (cadr abbrev)))
 	(condition-case nil
 	    (define-abbrev sql-mode-abbrev-table name expansion nil 0 t)
 	  (error


Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xemacs-sumo.spec	8 May 2005 17:13:23 -0000	1.5
+++ xemacs-sumo.spec	20 May 2005 15:43:48 -0000	1.6
@@ -3,7 +3,7 @@
 Summary: XEmacs Lisp packages
 Name: xemacs-sumo
 Version: %(echo %{sumo_ver} | tr -d -)
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Editors
 Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo_ver}.tar.bz2
@@ -33,6 +33,7 @@
 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
+Patch1: %{name}-sql-abbrev.patch
 Patch6: auctex-texsite-jlatex-detect-69129.patch
 Patch7: auctex-texjp-platex.patch
 Patch8: egg-wnn-host-unix-79826.patch
@@ -84,6 +85,8 @@
 %setup -q -c xemacs-sumo-%{version} -a1
 # fix font-lock warnings in JDE
 %patch0 -p0
+# fix abbrev error when loading sql-mode
+%patch1 -p0
 # fix jlatex autodetection
 %patch6 -p0
 # use ptex rather jtex by default for Japanese
@@ -191,6 +194,9 @@
 
 
 %changelog
+* Fri May 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050505-2
+- Apply upstream patch to fix abbrev error when loading sql-mode.
+
 * Thu May  5 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050505-1
 - 2005-05-05, mh-e toolbar specifier fix applied upstream.
 - Apply patch from Aidan Kehoe to fix font-lock warnings in JDE.