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.

diff --git a/lisp/browse-url.el b/lisp/browse-url.el
index 3be0331196baebfd0ed54d52de340f3fb42059bc..68f09f8440b2d7512465f36e9264d96138e60c29 100644 (file)
--- 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)))