Mercurial > emacs

changeset 68759:0b4b98e12e73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(substitute-key-definition-key): Pass t for NOERROR to indirect-function instead of using condition-case.
author Kim F. Storm <storm@cua.dk>
date Fri, 10 Feb 2006 00:02:47 +0000
parents 13c1b7c5f555
children 1d4bcec8c4c4
files lisp/subr.el
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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.