Mercurial > emacs
comparison lisp/progmodes/cc-defs.el @ 85703:49b7304c73bb
Reorder conditions to avoid warnings.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sat, 27 Oct 2007 20:27:34 +0000 |
| parents | c1ec1c8a8d2e |
| children | 6bf362c56364 880960b70474 |
comparison
equal
deleted
inserted
replaced
| 85702:8d96a389d68d | 85703:49b7304c73bb |
|---|---|
| 71 (not (fboundp 'push))) | 71 (not (fboundp 'push))) |
| 72 (cc-load "cc-fix"))) | 72 (cc-load "cc-fix"))) |
| 73 | 73 |
| 74 ; (eval-after-load "font-lock" ; 2006-07-09. font-lock is now preloaded | 74 ; (eval-after-load "font-lock" ; 2006-07-09. font-lock is now preloaded |
| 75 ; ' | 75 ; ' |
| 76 (if (and (not (featurep 'cc-fix)) ; only load the file once. | 76 (if (and (featurep 'xemacs) ; There is now (2005/12) code in GNU Emacs CVS |
| 77 (featurep 'xemacs) ; There is now (2005/12) code in GNU Emacs CVS | |
| 78 ; to make the call to f-l-c-k throw an error. | 77 ; to make the call to f-l-c-k throw an error. |
| 78 (not (featurep 'cc-fix)) ; only load the file once. | |
| 79 (let (font-lock-keywords) | 79 (let (font-lock-keywords) |
| 80 (font-lock-compile-keywords '("\\<\\>")) | 80 (font-lock-compile-keywords '("\\<\\>")) |
| 81 font-lock-keywords)) ; did the previous call foul this up? | 81 font-lock-keywords)) ; did the previous call foul this up? |
| 82 (load "cc-fix")) ;) | 82 (load "cc-fix")) ;) |
| 83 | 83 |
| 84 ;; The above takes care of the delayed loading, but this is necessary | 84 ;; The above takes care of the delayed loading, but this is necessary |
| 85 ;; to ensure correct byte compilation. | 85 ;; to ensure correct byte compilation. |
| 86 (eval-when-compile | 86 (eval-when-compile |
| 87 (if (and (not (featurep 'cc-fix)) | 87 (if (and (featurep 'xemacs) |
| 88 (featurep 'xemacs) | 88 (not (featurep 'cc-fix)) |
| 89 (progn | 89 (progn |
| 90 (require 'font-lock) | 90 (require 'font-lock) |
| 91 (let (font-lock-keywords) | 91 (let (font-lock-keywords) |
| 92 (font-lock-compile-keywords '("\\<\\>")) | 92 (font-lock-compile-keywords '("\\<\\>")) |
| 93 font-lock-keywords))) | 93 font-lock-keywords))) |