[Emacs-diffs] /srv/bzr/emacs/trunk r100079: * net/browse-url.el (browse-url-firefox-program): Use iceweasel if

[Stefan Monnier]

------------------------------------------------------------
revno: 100079
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2010-04-29 10:04:33 -0400
message:
  * net/browse-url.el (browse-url-firefox-program): Use iceweasel if
  firefox is absent.  Don't autoload.
  (browse-url-galeon-program): Don't autoload.
modified:
  lisp/ChangeLog
  lisp/net/browse-url.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-04-28 19:04:16 +0000
+++ b/lisp/ChangeLog    2010-04-29 14:04:33 +0000
@@ -1,3 +1,9 @@
+2010-04-29  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * bindings.el (complete-symbol): Move into minibuffer.el.

=== modified file 'lisp/net/browse-url.el'
--- a/lisp/net/browse-url.el    2010-03-12 19:13:38 +0000
+++ b/lisp/net/browse-url.el    2010-04-29 14:04:33 +0000
@@ -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)