diff options
| author | Andreas Schwab | 2005-12-30 14:00:30 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2005-12-30 14:00:30 +0000 |
| commit | f140f4e36c8d8fa01b54cd0b4b990a53c416570b (patch) | |
| tree | 10dac36812ad9be0f86c7ece047ea9a1e2feb44b | |
| parent | c2c50958b68ff4b464fdc081e83b5fb5264d3176 (diff) | |
| download | emacs-f140f4e36c8d8fa01b54cd0b4b990a53c416570b.tar.gz emacs-f140f4e36c8d8fa01b54cd0b4b990a53c416570b.zip | |
Ignore errors from font-lock-compile-keywords.
| -rw-r--r-- | lisp/progmodes/cc-defs.el | 8 |
1 files changed, 6 insertions, 2 deletions
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 @@ | |||
| 72 | (eval-after-load "font-lock" | 72 | (eval-after-load "font-lock" |
| 73 | '(if (and (not (featurep 'cc-fix)) ; only load the file once. | 73 | '(if (and (not (featurep 'cc-fix)) ; only load the file once. |
| 74 | (let (font-lock-keywords) | 74 | (let (font-lock-keywords) |
| 75 | (font-lock-compile-keywords '("\\<\\>")) | 75 | (condition-case nil |
| 76 | (font-lock-compile-keywords '("\\<\\>")) | ||
| 77 | (error nil)) | ||
| 76 | font-lock-keywords)) ; did the previous call foul this up? | 78 | font-lock-keywords)) ; did the previous call foul this up? |
| 77 | (load "cc-fix"))) | 79 | (load "cc-fix"))) |
| 78 | 80 | ||
| @@ -83,7 +85,9 @@ | |||
| 83 | (progn | 85 | (progn |
| 84 | (require 'font-lock) | 86 | (require 'font-lock) |
| 85 | (let (font-lock-keywords) | 87 | (let (font-lock-keywords) |
| 86 | (font-lock-compile-keywords '("\\<\\>")) | 88 | (condition-case nil |
| 89 | (font-lock-compile-keywords '("\\<\\>")) | ||
| 90 | (error nil)) | ||
| 87 | font-lock-keywords))) | 91 | font-lock-keywords))) |
| 88 | (cc-load "cc-fix"))) | 92 | (cc-load "cc-fix"))) |
| 89 | 93 | ||