diff options
| author | Richard M. Stallman <rms@gnu.org> | 2015-03-22 03:39:21 -0400 |
|---|---|---|
| committer | Richard Stallman <rms@gnu.org> | 2015-03-22 03:39:21 -0400 |
| commit | 414e79feeb445dc141b65767dfc3ba8dbb55723c (patch) | |
| tree | bbed193538cd911742608bc2158049fc0380c3a3 /lisp | |
| parent | f1cea3e96cb229b12dc12b0514c1269b9c09d530 (diff) | |
| download | emacs-414e79feeb445dc141b65767dfc3ba8dbb55723c.tar.gz | |
Prefer IceCat to Firefox and Iceweasel.
* lisp/net/browse-url.el (browse-url-firefox-program): Prefer IceCat, doc.
(browse-url-firefox-arguments)
(browse-url-firefox-startup-arguments): Doc fix.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/net/browse-url.el | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b9570badea0..be3a763ab25 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-22 Richard Stallman <rms@gnu.org> + + * net/browse-url.el (browse-url-firefox-program): Prefer IceCat, doc. + (browse-url-firefox-arguments) + (browse-url-firefox-startup-arguments): Doc fix. + 2015-02-01 Joakim Verona <joakim@verona.se> Support for the new Xwidget feature. * xwidget.el: diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 57c7b61fc28..e21a4c201f2 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -317,21 +317,21 @@ Defaults to the value of `browse-url-mozilla-arguments' at the time :group 'browse-url) (defcustom browse-url-firefox-program - (let ((candidates '("firefox" "iceweasel" "icecat"))) + (let ((candidates '("icecat" "iceweasel" "firefox"))) (while (and candidates (not (executable-find (car candidates)))) (setq candidates (cdr candidates))) (or (car candidates) "firefox")) - "The name by which to invoke Firefox." + "The name by which to invoke Firefox or a variant of it." :type 'string :group 'browse-url) (defcustom browse-url-firefox-arguments nil - "A list of strings to pass to Firefox as arguments." + "A list of strings to pass to Firefox (or variant) as arguments." :type '(repeat (string :tag "Argument")) :group 'browse-url) (defcustom browse-url-firefox-startup-arguments browse-url-firefox-arguments - "A list of strings to pass to Firefox when it starts up. + "A list of strings to pass to Firefox (or variant) when it starts up. Defaults to the value of `browse-url-firefox-arguments' at the time `browse-url' is loaded." :type '(repeat (string :tag "Argument")) |