HCoop
/
bpt
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7c70a95
)
(derived-mode-set-keymap): Cope if old-map is nil.
author
Richard M. Stallman
<rms@gnu.org>
Thu, 20 Jul 1995 17:42:55 +0000
(17:42 +0000)
committer
Richard M. Stallman
<rms@gnu.org>
Thu, 20 Jul 1995 17:42:55 +0000
(17:42 +0000)
lisp/derived.el
patch
|
blob
|
blame
|
history
diff --git
a/lisp/derived.el
b/lisp/derived.el
index
a1cfe84
..
36bf142
100644
(file)
--- a/
lisp/derived.el
+++ b/
lisp/derived.el
@@
-255,8
+255,9
@@
which more-or-less shadow
(let* ((map-name (derived-mode-map-name mode))
(new-map (eval map-name))
(old-map (current-local-map)))
- (if (get map-name 'derived-mode-unmerged)
- (derived-mode-merge-keymaps old-map new-map))
+ (and old-map
+ (get map-name 'derived-mode-unmerged)
+ (derived-mode-merge-keymaps old-map new-map))
(put map-name 'derived-mode-unmerged nil)
(use-local-map new-map)))