[Emacs-diffs] emacs/lisp ChangeLog net/browse-url.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/10/02 07:11:18

Modified files:
        lisp           : ChangeLog 
        lisp/net       : browse-url.el 

Log message:
        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)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16322&r2=1.16323
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/browse-url.el?cvsroot=emacs&r1=1.82&r2=1.83

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16322
retrieving revision 1.16323
diff -u -b -r1.16322 -r1.16323
--- ChangeLog   2 Oct 2009 03:48:36 -0000       1.16322
+++ ChangeLog   2 Oct 2009 07:11:13 -0000       1.16323
@@ -1,3 +1,9 @@
+2009-10-02  Kevin Ryde  <address@hidden>
+
+       * 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  <address@hidden>
 
        * allout.el (allout-init, allout-back-to-current-heading)

Index: net/browse-url.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/browse-url.el,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- net/browse-url.el   2 Oct 2009 03:48:45 -0000       1.82
+++ net/browse-url.el   2 Oct 2009 07:11:18 -0000       1.83
@@ -778,7 +778,10 @@
     ;; 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).