From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 20 Jun 2008 19:52:37 +0000 (+0000)
Subject: (c-make-inherited-keymap): Only use set-keymap-parents if set-keymap-parent
X-Git-Tag: emacs-pretest-23.0.90~4629
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b705155a621a65f1f8a5dd07edec647ab2ed27f9;p=emacs.git

(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 b80d9ac90af..0b6f336192d 100644
--- 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 0ae038578b7..9076491db34 100644
--- 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))