diff lisp/ido.el @ 90602:b5c13d1564a9

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 437-446) - Update from CVS - lisp/url/url-methods.el: Fix format error when http_proxy is empty string - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 137-140) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-111
author Miles Bader <miles@gnu.org>
date Wed, 20 Sep 2006 06:04:23 +0000
parents a1a25ac6c88a 299c5f25649b
children bb0e318b7c53
line wrap: on
line diff
--- a/lisp/ido.el	Thu Sep 14 09:24:00 2006 +0000
+++ b/lisp/ido.el	Wed Sep 20 06:04:23 2006 +0000
@@ -3618,7 +3618,7 @@
 		  ((stringp nextstr)
 		   (and (>= flen (setq slen (length nextstr)))
 			(string-equal (substring name (- flen slen)) nextstr)))
-		  ((fboundp nextstr) (funcall nextstr name))
+		  ((functionp nextstr) (funcall nextstr name))
 		  (t nil))
 		 (setq ignorep t
 		       ext-list nil
@@ -3628,7 +3628,7 @@
 	     (setq nextstr (car re-list))
 	     (if (cond
 		  ((stringp nextstr) (string-match nextstr name))
-		  ((fboundp nextstr) (funcall nextstr name))
+		  ((functionp nextstr) (funcall nextstr name))
 		  (t nil))
 		 (setq ignorep t
 		       re-list nil)