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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/06/20 19:52:38

Index: progmodes/cc-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/cc-mode.el,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- progmodes/cc-mode.el        26 May 2008 06:57:40 -0000      1.76
+++ progmodes/cc-mode.el        20 Jun 2008 19:52:37 -0000      1.77
@@ -214,12 +214,12 @@
     ;; function is called from top-level forms that are evaluated
     ;; while cc-bytecomp is active when one does M-x eval-buffer.
     (cond
-     ;; XEmacs
-     ((cc-bytecomp-fboundp 'set-keymap-parents)
-      (set-keymap-parents map c-mode-base-map))
      ;; Emacs
      ((cc-bytecomp-fboundp 'set-keymap-parent)
       (set-keymap-parent map c-mode-base-map))
+     ;; XEmacs
+     ((cc-bytecomp-fboundp 'set-keymap-parents)
+      (set-keymap-parents map c-mode-base-map))
      ;; incompatible
      (t (error "CC Mode is incompatible with this version of Emacs")))
     map))