Mercurial > emacs
changeset 96131:7ee547824da5
(c-make-inherited-keymap): Only use set-keymap-parents if set-keymap-parent
doesn't exist.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 20 Jun 2008 19:52:37 +0000 |
| parents | b0875b652dc2 |
| children | 94707ef52511 |
| files | lisp/ChangeLog lisp/progmodes/cc-mode.el |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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 |.
--- 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))