From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 20 Jul 1995 17:42:55 +0000 (+0000)
Subject: (derived-mode-set-keymap): Cope if old-map is nil.
X-Git-Tag: emacs-19.34~3248
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f34e6918388a3cf48ec459b5ba6388fefe386ecd;p=emacs.git

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

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