diff options
| author | Dan Nicolaescu <[email protected]> | 2007-10-27 20:27:34 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <[email protected]> | 2007-10-27 20:27:34 +0000 |
| commit | f83fb05aa10c8066350e678ae066ca77cd1717be (patch) | |
| tree | 083c5ed6b5e2e6dd24546e5b8e02f93f4a87581e /lisp/progmodes/cc-defs.el | |
| parent | ca54ae34f4acd01b8b9a5ee2928f7c8c44841a2f (diff) | |
Reorder conditions to avoid warnings.
Diffstat (limited to 'lisp/progmodes/cc-defs.el')
| -rw-r--r-- | lisp/progmodes/cc-defs.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index e932456fa9..f6adfb8cef 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el @@ -73,9 +73,9 @@ ; (eval-after-load "font-lock" ; 2006-07-09. font-lock is now preloaded ; ' -(if (and (not (featurep 'cc-fix)) ; only load the file once. - (featurep 'xemacs) ; There is now (2005/12) code in GNU Emacs CVS +(if (and (featurep 'xemacs) ; There is now (2005/12) code in GNU Emacs CVS ; to make the call to f-l-c-k throw an error. + (not (featurep 'cc-fix)) ; only load the file once. (let (font-lock-keywords) (font-lock-compile-keywords '("\\<\\>")) font-lock-keywords)) ; did the previous call foul this up? @@ -84,8 +84,8 @@ ;; The above takes care of the delayed loading, but this is necessary ;; to ensure correct byte compilation. (eval-when-compile - (if (and (not (featurep 'cc-fix)) - (featurep 'xemacs) + (if (and (featurep 'xemacs) + (not (featurep 'cc-fix)) (progn (require 'font-lock) (let (font-lock-keywords) |