[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-defs.el

[Andreas Schwab]

Index: emacs/lisp/progmodes/cc-defs.el
diff -u emacs/lisp/progmodes/cc-defs.el:1.37 
emacs/lisp/progmodes/cc-defs.el:1.38
--- emacs/lisp/progmodes/cc-defs.el:1.37        Mon Dec 26 04:51:46 2005
+++ emacs/lisp/progmodes/cc-defs.el     Fri Dec 30 14:00:30 2005
@@ -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")))