(Fremap_command): Return nil if arg is not a symbol.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/keymap.c b/src/keymap.c
index 2f8a44cfb3d..3c8c7a3ce3f 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1070,10 +1070,13 @@ the front of KEYMAP.  */)
 
 DEFUN ("remap-command", Fremap_command, Sremap_command, 1, 1, 0,
        doc: /* Return the remapping for command COMMAND in current keymaps.
-Returns nil if COMMAND is not remapped.  */)
+Returns nil if COMMAND is not remapped (or not a symbol).  */)
      (command)
      Lisp_Object command;
 {
+  if (!SYMBOLP (command))
+    return Qnil;
+
   ASET (remap_command_vector, 1, command);
   return Fkey_binding (remap_command_vector, Qnil, Qt);
 }