OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xemacs?expand=0&rev=31

bugzilla-358333-kde-font-lock-problem.patch

@@ -0,0 +1,30 @@
+diff -ru xemacs-21.5.28.20080119.orig//lisp/font-lock.el xemacs-21.5.28.20080119/lisp/font-lock.el
+--- xemacs-21.5.28.20080119.orig//lisp/font-lock.el	2007-08-18 18:33:30.000000000 +0200
++++ xemacs-21.5.28.20080119/lisp/font-lock.el	2008-02-04 22:14:28.000000000 +0100
+@@ -959,7 +959,7 @@
+ 	 (let ((was-compiled (eq (car font-lock-keywords) t)))
+ 	   ;; Bring back the user-level (uncompiled) keywords.
+ 	   (if was-compiled
+-	       (setq font-lock-keywords (cadr font-lock-keywords)))
++	       (setq font-lock-keywords (cdr font-lock-keywords)))
+ 	   ;; Now modify or replace them.
+ 	   (if (eq how 'set)
+ 	       (setq font-lock-keywords keywords)
+@@ -1069,13 +1069,14 @@
+ 	 (let ((was-compiled (eq (car font-lock-keywords) t)))
+ 	   ;; Bring back the user-level (uncompiled) keywords.
+ 	   (if was-compiled
+-	       (setq font-lock-keywords (cadr font-lock-keywords)))
++	       (setq font-lock-keywords (cdr font-lock-keywords)))
+ 
+ 	   ;; Edit them.
+ 	   (setq font-lock-keywords (copy-sequence font-lock-keywords))
+ 	   (dolist (keyword keywords)
+ 	     (setq font-lock-keywords
+-		   (delete keyword font-lock-keywords)))
++		   (delete (font-lock-compile-keyword keyword)
++			   (delete keyword font-lock-keywords))))
+ 
+ 	   ;; If the keywords were compiled before, compile them again.
+ 	   (if was-compiled
+xemacs-21.5.28.20080119/lispだけに発見: font-lock.el.orig

xemacs.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Feb 04 22:16:40 CET 2008 - mfabian@suse.de
+
+- bnc#358333: fix bugs in font-lock-add-keywords and
+  font-lock-remove-keywords which caused severe problems when
+  trying to use the kde-emacs lisp files to better support editing
+  KDE source code:
+  svn://anonsvn.kde.org/home/kde/trunk/KDE/kdesdk/scripts/kde-emacs
+
 -------------------------------------------------------------------
 Sat Jan 19 15:34:10 CET 2008 - mfabian@suse.de
 

xemacs.spec

@@ -37,7 +37,7 @@ Requires:       xemacs-info xemacs-packages ctags
 Conflicts:      gnuserv
 AutoReqProv:    on
 Version:        21.5.28.20080119
-Release:        1
+Release:        8
 Summary:        XEmacs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Howto get the cvs tree of XEmacs:
@@ -87,6 +87,7 @@ Patch45:        fix-defface-custom-modified-face.patch
 Patch46:        byte-comp-problem.patch
 Patch292811:    bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch
 Patch301352:    bugzilla-301352-fix-wrong-incrementing-in-macros.patch
+Patch358333:    bugzilla-358333-kde-font-lock-problem.patch
 
 %description
 This is the current version of XEmacs, formerly known as Lucid-Emacs.
@@ -177,6 +178,7 @@ Authors:
 %patch46 -p1
 %patch292811 -p1
 %patch301352 -p1
+%patch358333 -p1
 %patch0 -p1
 find lisp/ etc/ -name '*.elc' | xargs -r rm -f
 %ifarch ia64
@@ -579,6 +581,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/xemacs/site-packages/lisp/term/
 
 %changelog
+* Mon Feb 04 2008 mfabian@suse.de
+- bnc#358333: fix bugs in font-lock-add-keywords and
+  font-lock-remove-keywords which caused severe problems when
+  trying to use the kde-emacs lisp files to better support editing
+  KDE source code:
+  svn://anonsvn.kde.org/home/kde/trunk/KDE/kdesdk/scripts/kde-emacs
 * Sat Jan 19 2008 mfabian@suse.de
 - update to 21.5.28.20080119 (fixes bugzilla #354705).
 * Mon Jan 14 2008 mfabian@suse.de
@@ -863,7 +871,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Feb 10 2005 mfabian@suse.de
 - remove configure option "--rel-alloc" because it makes
   XEmacs 21.5.18 often crash when using 'compile-goto-error'.
-* Fri Feb 04 2005 schwab@suse.de
+* Sat Feb 05 2005 schwab@suse.de
 - Fix format string bug in movemail.
 * Fri Feb 04 2005 werner@suse.de
 - Security fix for movemail applied (bug #50237)
@@ -910,7 +918,7 @@ rm -rf $RPM_BUILD_ROOT
   incompatible to XEmacs and should never be read.
 - use -adobe-helvetica-bold-* instead of -gnu-unifont- by default
   for the menus because most users like it better.
-* Mon Mar 08 2004 mfabian@suse.de
+* Tue Mar 09 2004 mfabian@suse.de
 - adapt Werner's patch for xemacs 21.5.16.
 * Mon Mar 08 2004 werner@suse.de
 - Make workaround to a real fix: autoconf 2.59 does not accept
@@ -1106,7 +1114,7 @@ rm -rf $RPM_BUILD_ROOT
   translated app-defaults file (e.g. en_US.UTF-8).
 - generate the file lists for the .el and .elc files automatically
   in the .spec file
-* Mon May 06 2002 schwab@suse.de
+* Tue May 07 2002 schwab@suse.de
 - Readd ia64 patch, suitably adapted.
 - Fix lib64 configuration.
 * Thu May 02 2002 mfabian@suse.de
@@ -1288,7 +1296,7 @@ rm -rf $RPM_BUILD_ROOT
   * ispell menus
   * xterm/console key mappings
 	- Fix font menu: set `ignore scaled fonts' to nil
-* Fri Nov 05 1999 werner@suse.de
+* Sat Nov 06 1999 werner@suse.de
 - Change file list of xe_info and xe_lisp
 * Thu Nov 04 1999 werner@suse.de
 - Remove libgif from required packages
@@ -1302,7 +1310,7 @@ rm -rf $RPM_BUILD_ROOT
 - Add patch for glibc and __malloc_hook
 * Tue Oct 26 1999 werner@suse.de
 - New glibc requires `with system malloc'
-* Wed Oct 20 1999 werner@suse.de
+* Thu Oct 21 1999 werner@suse.de
 - Last checks
 * Wed Oct 20 1999 werner@suse.de
 - New version 21.1.7
@@ -1342,7 +1350,7 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Nov 03 1998 werner@suse.de
 - Change names of languages and encoding style in ispell
   from `language    (encod)' to `language-encod'
-* Tue Jul 28 1998 werner@suse.de
+* Wed Jul 29 1998 werner@suse.de
 - Do not use system malloc ... some parts of xemacs arn't
   smart enough for that.
 	- Disable const
@@ -1362,7 +1370,7 @@ rm -rf $RPM_BUILD_ROOT
 	- Use -rpath-link /usr/X11R6/lib
 	- Avoid multiple common
 	- Remove and set some CONST
-* Wed May 27 1998 werner@suse.de
+* Thu May 28 1998 werner@suse.de
 - Use Xaw3d instead of Xaw to avoid trouble with xaw3dd
 	- Change pop service "pop" to "pop3"
 * Tue Mar 03 1998 werner@suse.de