Mercurial > emacs

diff lisp/net/browse-url.el @ 108162:3eb0fffdd08f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* net/browse-url.el (browse-url-firefox-program): Use iceweasel if firefox is absent. Don't autoload. (browse-url-galeon-program): Don't autoload.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 29 Apr 2010 10:04:33 -0400
parents 3c0cd76e49ff
children 17256ad564e9
line wrap: on
line diff
--- 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)