Reorder conditions to avoid warnings.

2 files changed, 8 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d91d92609e4..063d303b80a 100644
--- 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 e932456fa91..f6adfb8cef9 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)