# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1193516854 0
# Node ID 49b7304c73bb145a1c1652a55bf5cb74101be9df
# Parent  8d96a389d68d598d1da5a9d07936b82bf8693357
Reorder conditions to avoid warnings.

diff -r 8d96a389d68d -r 49b7304c73bb lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Oct 27 20:25:45 2007 +0000
+++ b/lisp/ChangeLog	Sat Oct 27 20:27:34 2007 +0000
@@ -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 -r 8d96a389d68d -r 49b7304c73bb lisp/progmodes/cc-defs.el
--- a/lisp/progmodes/cc-defs.el	Sat Oct 27 20:25:45 2007 +0000
+++ b/lisp/progmodes/cc-defs.el	Sat Oct 27 20:27:34 2007 +0000
@@ -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)