From: Glenn Morris <rgm@gnu.org>
Date: Fri, 2 Oct 2009 07:11:13 +0000 (+0000)
Subject: Kevin Ryde  <user42 at zip.com.au>
X-Git-Tag: emacs-pretest-23.1.90~993
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=895d190402f5b7ed021bd9c9e05c81d473dfee08;p=emacs.git

Kevin Ryde  <user42 at zip.com.au>

(browse-url): Pass any symbol in browse-url-browser-function to
`apply', since if you've mistakenly put an unbound symbol then the
error is clearer.  (Bug#4531)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 54929a6c0ca..cc330ada560 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-02  Kevin Ryde  <user42@zip.com.au>
+
+	* net/browse-url.el (browse-url): Pass any symbol in
+	browse-url-browser-function to `apply', since if you've mistakenly put
+	an unbound symbol then the error is clearer.  (Bug#4531)
+
 2009-10-02  Juanma Barranquero  <lekktu@gmail.com>
 
 	* allout.el (allout-init, allout-back-to-current-heading)
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 1e724dda047..ead2a39c9d4 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -778,7 +778,10 @@ Prompts for a URL, defaulting to the URL at or before point.  Variable
     ;; which may not even exist any more.
     (if (stringp (frame-parameter (selected-frame) 'display))
         (setenv "DISPLAY" (frame-parameter (selected-frame) 'display)))
-    (if (functionp browse-url-browser-function)
+    ;; Send any symbol to `apply', not just fboundp ones, since void-function
+    ;; from apply is clearer than wrong-type-argument from dolist.
+    (if (or (symbolp browse-url-browser-function)
+            (functionp browse-url-browser-function))
         (apply browse-url-browser-function url args)
       ;; The `function' can be an alist; look down it for first match
       ;; and apply the function (which might be a lambda).