Commit f83fb05a authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

Reorder conditions to avoid warnings.

parent ca54ae34
2007-10-27 Dan Nicolaescu <dann@ics.uci.edu>
* progmodes/cc-defs.el: Reorder conditions to avoid warnings.
2007-10-27 Juanma Barranquero <lekktu@gmail.com>
* desktop.el (desktop-load-locked-desktop, desktop-base-lock-name)
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment