(c-make-inherited-keymap): Only use set-keymap-parents if set-keymap-parent

doesn't exist.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b80d9ac90afa5528adf37fd9fdd9be8076db9b44..0b6f336192d4d1edd8197ae5cbde291c12333f27 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * progmodes/cc-mode.el (c-make-inherited-keymap): Only use
+       set-keymap-parents if set-keymap-parent doesn't exist.
+
        * vc-bzr.el (vc-bzr-annotate-extract-revision-at-line):
        Allow more than one space before the |.
 

diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 0ae038578b7083b8291e2f838af4c0bc924957d9..9076491db344e5bee40c9dedbfd953a134578599 100644 (file)
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -214,12 +214,12 @@ control).  See \"cc-mode.el\" for more info."
     ;; 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))