procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Kevin Ryde <user42 at zip.com.au>

Browse source 
(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)
This commit is contained in:
Glenn Morris 2009-10-02 07:11:13 +00:00
parent e9a0aef83c
commit 895d190402
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -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)

5
lisp/net/browse-url.el
View file

@ -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).