Mercurial > emacs
diff lisp/derived.el @ 12611:04c737b6b30e
(derived-mode-set-keymap): Cope if old-map is nil.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Thu, 20 Jul 1995 17:42:55 +0000 |
parents | 84e419a90298 |
children | 6d2b9a2c1ca4 |
line wrap: on
line diff
--- a/lisp/derived.el Thu Jul 20 06:14:12 1995 +0000 +++ b/lisp/derived.el Thu Jul 20 17:42:55 1995 +0000 @@ -255,8 +255,9 @@ (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)))