Reorder conditions to avoid warnings.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d91d92609e4df54284fcac395fe2bda62fb768a1..063d303b80a5546589cfa5095af229ff9e4ae6f8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+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)

diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index e932456fa9129750084dd83db20332c37693c1bb..f6adfb8cef9ebe49a1cf13e1e264667b998af064 100644 (file)
--- 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)