* net/browse-url.el (browse-url-firefox-program): Use iceweasel if

firefox is absent.  Don't autoload.
(browse-url-galeon-program): Don't autoload.

2 files changed, 12 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a90aa1dc43..b1964d3a673 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * net/browse-url.el (browse-url-firefox-program): Use iceweasel if
+        firefox is absent.  Don't autoload.
+        (browse-url-galeon-program): Don't autoload.
+
 2010-04-28  Chong Yidong  <cyd@stupidchicken.com>
 
         * bindings.el (complete-symbol): Move into minibuffer.el.
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 261b765eaeb..420381cf43e 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -313,8 +313,11 @@ Defaults to the value of `browse-url-mozilla-arguments' at the time
   :type '(repeat (string :tag "Argument"))
   :group 'browse-url)
 
-;;;###autoload
-(defcustom browse-url-firefox-program (purecopy "firefox")
+(defcustom browse-url-firefox-program
+  (let ((candidates '("firefox" "iceweasel")))
+    (while (and candidates (not (executable-find (car candidates))))
+      (setq candidates (cdr candidates)))
+    (or (car candidates) "firefox"))
   "The name by which to invoke Firefox."
   :type 'string
   :group 'browse-url)
@@ -331,8 +334,7 @@ Defaults to the value of `browse-url-firefox-arguments' at the time
   :type '(repeat (string :tag "Argument"))
   :group 'browse-url)
 
-;;;###autoload
-(defcustom browse-url-galeon-program (purecopy "galeon")
+(defcustom browse-url-galeon-program "galeon"
   "The name by which to invoke Galeon."
   :type 'string
   :group 'browse-url)