From: Andreas Schwab <schwab@suse.de>
Date: Fri, 30 Dec 2005 14:00:30 +0000 (+0000)
Subject: Ignore errors from font-lock-compile-keywords.
X-Git-Tag: emacs-pretest-22.0.90~4972
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f140f4e36c8d8fa01b54cd0b4b990a53c416570b;p=emacs.git

Ignore errors from font-lock-compile-keywords.
---

diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index b237dd9a598..9de0a24f09e 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -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")))