diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-06-20 19:52:37 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-06-20 19:52:37 +0000 |
| commit | b705155a621a65f1f8a5dd07edec647ab2ed27f9 (patch) | |
| tree | 829aaf08744dc95a5a17d27cfaa93568fa738cde /lisp/progmodes/cc-mode.el | |
| parent | 17150f48571dece239e53b4281b96b53ab91387c (diff) | |
| download | emacs-b705155a621a65f1f8a5dd07edec647ab2ed27f9.tar.gz emacs-b705155a621a65f1f8a5dd07edec647ab2ed27f9.tar.bz2 emacs-b705155a621a65f1f8a5dd07edec647ab2ed27f9.zip | |
(c-make-inherited-keymap): Only use set-keymap-parents if set-keymap-parent
doesn't exist.
Diffstat (limited to 'lisp/progmodes/cc-mode.el')
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 6 |
1 files changed, 3 insertions, 3 deletions
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)) |