diff options
| author | Dave Love | 1998-11-12 15:54:40 +0000 |
|---|---|---|
| committer | Dave Love | 1998-11-12 15:54:40 +0000 |
| commit | 833eadc27c5d6c03425c7f3eddde43cec4a48251 (patch) | |
| tree | 0c37fef01e3182d1e40b8bf2b3805897dcc366cc | |
| parent | 3025dc8868560992318079416a1d9a7831da541f (diff) | |
| download | emacs-833eadc27c5d6c03425c7f3eddde43cec4a48251.tar.gz 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.
| -rw-r--r-- | lisp/browse-url.el | 11 |
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 | |||
| 617 | `browse-url-browser-function' says which browser to use." | 617 | `browse-url-browser-function' says which browser to use." |
| 618 | (interactive (browse-url-interactive-arg "URL: ")) | 618 | (interactive (browse-url-interactive-arg "URL: ")) |
| 619 | (let ((bf browse-url-browser-function) re) | 619 | (let ((bf browse-url-browser-function) re) |
| 620 | (while (consp bf) | 620 | (unless (functionp bf) |
| 621 | (setq re (car (car bf)) | 621 | (while (consp bf) |
| 622 | bf (if (string-match re url) | 622 | (setq re (car (car bf)) |
| 623 | (cdr (car bf)) ; The function | 623 | bf (if (string-match re url) |
| 624 | (cdr bf)))) ; More pairs | 624 | (cdr (car bf)) ; The function |
| 625 | (cdr bf))))) ; More pairs | ||
| 625 | (or bf (error "No browser in browse-url-browser-function matching URL %s" | 626 | (or bf (error "No browser in browse-url-browser-function matching URL %s" |
| 626 | url)) | 627 | url)) |
| 627 | (apply bf url args))) | 628 | (apply bf url args))) |