diff lisp/progmodes/cc-mode.el @ 96131:7ee547824da5

(c-make-inherited-keymap): Only use set-keymap-parents if set-keymap-parent doesn't exist.

--- a/lisp/progmodes/cc-mode.el	Fri Jun 20 19:38:53 2008 +0000
+++ b/lisp/progmodes/cc-mode.el	Fri Jun 20 19:52:37 2008 +0000
@@ -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
+     ;; 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))
-     ;; Emacs
-     ((cc-bytecomp-fboundp 'set-keymap-parent)
-      (set-keymap-parent map c-mode-base-map))
      ;; incompatible
      (t (error "CC Mode is incompatible with this version of Emacs")))
     map))