1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-29 19:48:19 +00:00

(derived-mode-set-keymap): Cope if old-map is nil.

This commit is contained in:
Richard M. Stallman 1995-07-20 17:42:55 +00:00
parent 7c70a955ac
commit f34e691838

View File

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