[Emacs-diffs] Changes to emacs/lisp/subr.el

[Kim F . Storm]

Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.427 emacs/lisp/subr.el:1.428
*** emacs/lisp/subr.el:1.427    Mon Nov 22 06:00:51 2004
--- emacs/lisp/subr.el  Tue Nov 23 15:23:57 2004
***************
*** 422,428 ****
            (nconc (nreverse skipped) newdef)))
        ;; Look past a symbol that names a keymap.
        (setq inner-def
!           (condition-case nil (indirect-function defn) (error defn)))
        ;; For nested keymaps, we use `inner-def' rather than `defn' so as to
        ;; avoid autoloading a keymap.  This is mostly done to preserve the
        ;; original non-autoloading behavior of pre-map-keymap times.
--- 422,429 ----
            (nconc (nreverse skipped) newdef)))
        ;; Look past a symbol that names a keymap.
        (setq inner-def
!           (and defn
!                (condition-case nil (indirect-function defn) (error defn))))
        ;; For nested keymaps, we use `inner-def' rather than `defn' so as to
        ;; avoid autoloading a keymap.  This is mostly done to preserve the
        ;; original non-autoloading behavior of pre-map-keymap times.