diff options
| author | Richard M. Stallman <rms@gnu.org> | 1995-07-20 17:42:55 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1995-07-20 17:42:55 +0000 |
| commit | f34e6918388a3cf48ec459b5ba6388fefe386ecd (patch) | |
| tree | 69b2e6226f819b1176196472ea50414d950e8550 /lisp/derived.el | |
| parent | 7c70a955ac5b1dfba4abf75f64b983cbe67ad27b (diff) | |
| download | emacs-f34e6918388a3cf48ec459b5ba6388fefe386ecd.tar.gz | |
(derived-mode-set-keymap): Cope if old-map is nil.
Diffstat (limited to 'lisp/derived.el')
| -rw-r--r-- | lisp/derived.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/derived.el b/lisp/derived.el index a1cfe8485f8..36bf1428125 100644 --- 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))) |