1 files changed, 2 insertions, 1 deletions

diff --git a/src/keymap.c b/src/keymap.c
index 5885e8ba199..6a08a86ef47 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -671,7 +671,8 @@ Lisp_Object
 copy_keymap_1 (chartable, idx, elt)
      Lisp_Object chartable, idx, elt;
 {
-  Faset (chartable, idx, Fcopy_keymap (elt));
+  if (!SYMBOLP (elt) && ! NILP (Fkeymapp (elt)))
+    Faset (chartable, idx, Fcopy_keymap (elt));
 }
 
 DEFUN ("copy-keymap", Fcopy_keymap, Scopy_keymap, 1, 1, 0,