Mercurial > emacs
changeset 108162:3eb0fffdd08f
* 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 | 514ebf69b289 |
| children | ee8e46e5ac6d |
| files | lisp/ChangeLog lisp/net/browse-url.el |
| diffstat | 2 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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)