comparison src/keymap.c @ 83219:e86fc76a45e4

Merged in changes from CVS trunk. Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-611 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-612 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-613 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-614 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-615 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-46 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-47 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-48 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-49 Add {arch}/=commit-merge-make-log * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-50 {arch}/=commit-merge-make-log: Don't die if there are no ChangeLog changes git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-259
author Karoly Lorentey <lorentey@elte.hu>
date Thu, 14 Oct 2004 14:42:03 +0000
parents 3b9f4bbca1bf 3965acfc4e80
children 3ec251523b3e
comparison
equal deleted inserted replaced
83218:47f53c5c9620 83219:e86fc76a45e4
266 if (EQ (XCAR (tem), Qkeymap)) 266 if (EQ (XCAR (tem), Qkeymap))
267 return tem; 267 return tem;
268 268
269 /* Should we do an autoload? Autoload forms for keymaps have 269 /* Should we do an autoload? Autoload forms for keymaps have
270 Qkeymap as their fifth element. */ 270 Qkeymap as their fifth element. */
271 if ((autoload || !error) && EQ (XCAR (tem), Qautoload)) 271 if ((autoload || !error) && EQ (XCAR (tem), Qautoload)
272 && SYMBOLP (object))
272 { 273 {
273 Lisp_Object tail; 274 Lisp_Object tail;
274 275
275 tail = Fnth (make_number (4), tem); 276 tail = Fnth (make_number (4), tem);
276 if (EQ (tail, Qkeymap)) 277 if (EQ (tail, Qkeymap))