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