# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1213991557 0
# Node ID 7ee547824da559dcd20b96ef6b2f42ac79f39dfe
# Parent  b0875b652dc247613c9f8dac4a05d953f776cfd4
(c-make-inherited-keymap): Only use set-keymap-parents if set-keymap-parent
doesn't exist.

diff -r b0875b652dc2 -r 7ee547824da5 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jun 20 19:38:53 2008 +0000
+++ b/lisp/ChangeLog	Fri Jun 20 19:52:37 2008 +0000
@@ -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 -r b0875b652dc2 -r 7ee547824da5 lisp/progmodes/cc-mode.el
--- 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))