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

[Kim F. Storm]

Index: emacs/lisp/subr.el
diff -u emacs/lisp/subr.el:1.496 emacs/lisp/subr.el:1.497
--- emacs/lisp/subr.el:1.496    Mon Feb  6 14:33:35 2006
+++ emacs/lisp/subr.el  Fri Feb 10 00:02:47 2006
@@ -607,8 +607,7 @@
            (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))))
+           (or (indirect-function defn t) 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.