[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-defs.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   07/10/27 20:27:35

Index: progmodes/cc-defs.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/cc-defs.el,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- progmodes/cc-defs.el        26 Jul 2007 05:27:24 -0000      1.49
+++ progmodes/cc-defs.el        27 Oct 2007 20:27:33 -0000      1.50
@@ -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)