Commit 8e4dfd54 authored by Jim Blandy's avatar Jim Blandy

* keymap.c (get_keymap_1): Don't try to autoload OBJECT's function

	unless the autoload form indicates that it's a keymap.
parent 07d2b8de
......@@ -205,11 +205,17 @@ get_keymap_1 (object, error, autoload)
if (CONSP (tem) && EQ (XCONS (tem)->car, Qkeymap))
return tem;
/* Should we do an autoload? */
/* Should we do an autoload? Autoload forms for keymaps have
Qkeymap as their fifth element. */
if (autoload
&& XTYPE (object) == Lisp_Symbol
&& CONSP (tem)
&& EQ (XCONS (tem)->car, Qautoload))
Lisp_Object tail;
tail = Fnth (make_number (4), tem);
if (EQ (tail, Qkeymap))
struct gcpro gcpro1, gcpro2;
......@@ -219,6 +225,7 @@ get_keymap_1 (object, error, autoload)
goto autoload_retry;
if (error)
wrong_type_argument (Qkeymapp, object);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment