summaryrefslogtreecommitdiff
path: root/lisp/browse-url.el
diff options
context:
space:
mode:
authorDave Love <fx@gnu.org>1998-11-12 15:54:40 +0000
committerDave Love <fx@gnu.org>1998-11-12 15:54:40 +0000
commit833eadc27c5d6c03425c7f3eddde43cec4a48251 (patch)
tree0c37fef01e3182d1e40b8bf2b3805897dcc366cc /lisp/browse-url.el
parent3025dc8868560992318079416a1d9a7831da541f (diff)
downloademacs-833eadc27c5d6c03425c7f3eddde43cec4a48251.tar.gz
emacs-833eadc27c5d6c03425c7f3eddde43cec4a48251.tar.bz2
emacs-833eadc27c5d6c03425c7f3eddde43cec4a48251.zip
1998-11-09 Sam Steingold <sds@goems.com>
* browse-url.el (browse-url): handle the case when `browse-url-browser-function' is a lambda list.
Diffstat (limited to 'lisp/browse-url.el')
-rw-r--r--lisp/browse-url.el11
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/browse-url.el b/lisp/browse-url.el
index 3be0331196b..68f09f8440b 100644
--- a/lisp/browse-url.el
+++ b/lisp/browse-url.el
@@ -617,11 +617,12 @@ Prompts for a URL, defaulting to the URL at or before point. Variable
`browse-url-browser-function' says which browser to use."
(interactive (browse-url-interactive-arg "URL: "))
(let ((bf browse-url-browser-function) re)
- (while (consp bf)
- (setq re (car (car bf))
- bf (if (string-match re url)
- (cdr (car bf)) ; The function
- (cdr bf)))) ; More pairs
+ (unless (functionp bf)
+ (while (consp bf)
+ (setq re (car (car bf))
+ bf (if (string-match re url)
+ (cdr (car bf)) ; The function
+ (cdr bf))))) ; More pairs
(or bf (error "No browser in browse-url-browser-function matching URL %s"
url))
(apply bf url args)))