Mercurial > emacs

changeset 12611:04c737b6b30e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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 2e1cc7fae2ba
children 9d8cf42ed0ba
files lisp/derived.el
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
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)))