# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1139529767 0
# Node ID 0b4b98e12e73450ee329b017865d7862b5b60ba3
# Parent  13c1b7c5f555a022bc1f2c14e5641c02959bda99
(substitute-key-definition-key): Pass t for NOERROR to
indirect-function instead of using condition-case.

diff -r 13c1b7c5f555 -r 0b4b98e12e73 lisp/subr.el
--- a/lisp/subr.el	Fri Feb 10 00:00:31 2006 +0000
+++ b/lisp/subr.el	Fri Feb 10 00:02:47 2006 +0000
@@ -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.