# HG changeset patch
# User Andreas Schwab <schwab@suse.de>
# Date 1135951230 0
# Node ID 6e1e5372c3f69939ecc39d2eeba299551bf920f6
# Parent  477140fdc860586dc70b3d6fea38190ba63c326d
Ignore errors from font-lock-compile-keywords.

diff -r 477140fdc860 -r 6e1e5372c3f6 lisp/progmodes/cc-defs.el
--- a/lisp/progmodes/cc-defs.el	Fri Dec 30 13:29:20 2005 +0000
+++ b/lisp/progmodes/cc-defs.el	Fri Dec 30 14:00:30 2005 +0000
@@ -72,7 +72,9 @@
 (eval-after-load "font-lock"
   '(if (and (not (featurep 'cc-fix)) ; only load the file once.
             (let (font-lock-keywords)
-              (font-lock-compile-keywords '("\\<\\>"))
+              (condition-case nil
+		  (font-lock-compile-keywords '("\\<\\>"))
+		(error nil))
 	      font-lock-keywords))     ; did the previous call foul this up?
        (load "cc-fix")))
 
@@ -83,7 +85,9 @@
 	   (progn
 	     (require 'font-lock)
 	     (let (font-lock-keywords)
-	       (font-lock-compile-keywords '("\\<\\>"))
+	       (condition-case nil
+		   (font-lock-compile-keywords '("\\<\\>"))
+		 (error nil))
 	       font-lock-keywords)))
       (cc-load "cc-fix")))