# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1272549873 14400
# Node ID 3eb0fffdd08feda455fbc43c5444af49319c17ec
# Parent  514ebf69b28924d3e7bd50edc45c1ed764ebf4d8
* net/browse-url.el (browse-url-firefox-program): Use iceweasel if
firefox is absent.  Don't autoload.
(browse-url-galeon-program): Don't autoload.

diff -r 514ebf69b289 -r 3eb0fffdd08f lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Apr 29 08:42:01 2010 -0400
+++ b/lisp/ChangeLog	Thu Apr 29 10:04:33 2010 -0400
@@ -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 -r 514ebf69b289 -r 3eb0fffdd08f lisp/net/browse-url.el
--- a/lisp/net/browse-url.el	Thu Apr 29 08:42:01 2010 -0400
+++ b/lisp/net/browse-url.el	Thu Apr 29 10:04:33 2010 -0400
@@ -313,8 +313,11 @@
   :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 @@
   :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)