procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
doesn't exist.
This commit is contained in:
Stefan Monnier 2008-06-20 19:52:37 +00:00
parent 17150f4857
commit b705155a62
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -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 |.

6
lisp/progmodes/cc-mode.el
View file

@ -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))