Mercurial > emacs

changeset 67926:6e1e5372c3f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ignore errors from font-lock-compile-keywords.
author Andreas Schwab <schwab@suse.de>
date Fri, 30 Dec 2005 14:00:30 +0000
parents 477140fdc860
children 6d7ad1c6a1de
files lisp/progmodes/cc-defs.el
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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")))