diff options
| author | Glenn Morris <rgm@gnu.org> | 2009-10-02 07:11:13 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2009-10-02 07:11:13 +0000 |
| commit | 895d190402f5b7ed021bd9c9e05c81d473dfee08 (patch) | |
| tree | df6c7c6a6e724b37689b9df48082c3ac81c5e45a /lisp/net/browse-url.el | |
| parent | e9a0aef83c8176a32bc29ef342c68b91b73c64f5 (diff) | |
| download | emacs-895d190402f5b7ed021bd9c9e05c81d473dfee08.tar.gz | |
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)
Diffstat (limited to 'lisp/net/browse-url.el')
| -rw-r--r-- | lisp/net/browse-url.el | 5 |
1 files changed, 4 insertions, 1 deletions
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). |