comparison lisp/progmodes/cc-defs.el @ 67926:6e1e5372c3f6

Ignore errors from font-lock-compile-keywords.
author Andreas Schwab <schwab@suse.de>
date Fri, 30 Dec 2005 14:00:30 +0000
parents e7ac0fc47db5
children dc49655f57ae 7beb78bc1f8e
comparison
equal deleted inserted replaced
67925:477140fdc860 67926:6e1e5372c3f6
70 (cc-load "cc-fix"))) 70 (cc-load "cc-fix")))
71 71
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
79 ;; The above takes care of the delayed loading, but this is necessary 81 ;; The above takes care of the delayed loading, but this is necessary
80 ;; to ensure correct byte compilation. 82 ;; to ensure correct byte compilation.
81 (eval-when-compile 83 (eval-when-compile
82 (if (and (not (featurep 'cc-fix)) 84 (if (and (not (featurep 'cc-fix))
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
90 94
91 ;;; Variables also used at compile time. 95 ;;; Variables also used at compile time.