diff options
| author | Richard M. Stallman | 2015-03-22 03:39:21 -0400 |
|---|---|---|
| committer | Richard Stallman | 2015-03-22 03:39:21 -0400 |
| commit | 414e79feeb445dc141b65767dfc3ba8dbb55723c (patch) | |
| tree | bbed193538cd911742608bc2158049fc0380c3a3 | |
| parent | f1cea3e96cb229b12dc12b0514c1269b9c09d530 (diff) | |
| download | emacs-414e79feeb445dc141b65767dfc3ba8dbb55723c.tar.gz emacs-414e79feeb445dc141b65767dfc3ba8dbb55723c.zip | |
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.
| -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 @@ | |||
| 1 | 2015-03-22 Richard Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * net/browse-url.el (browse-url-firefox-program): Prefer IceCat, doc. | ||
| 4 | (browse-url-firefox-arguments) | ||
| 5 | (browse-url-firefox-startup-arguments): Doc fix. | ||
| 6 | |||
| 1 | 2015-02-01 Joakim Verona <joakim@verona.se> | 7 | 2015-02-01 Joakim Verona <joakim@verona.se> |
| 2 | Support for the new Xwidget feature. | 8 | Support for the new Xwidget feature. |
| 3 | * xwidget.el: | 9 | * 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 | |||
| 317 | :group 'browse-url) | 317 | :group 'browse-url) |
| 318 | 318 | ||
| 319 | (defcustom browse-url-firefox-program | 319 | (defcustom browse-url-firefox-program |
| 320 | (let ((candidates '("firefox" "iceweasel" "icecat"))) | 320 | (let ((candidates '("icecat" "iceweasel" "firefox"))) |
| 321 | (while (and candidates (not (executable-find (car candidates)))) | 321 | (while (and candidates (not (executable-find (car candidates)))) |
| 322 | (setq candidates (cdr candidates))) | 322 | (setq candidates (cdr candidates))) |
| 323 | (or (car candidates) "firefox")) | 323 | (or (car candidates) "firefox")) |
| 324 | "The name by which to invoke Firefox." | 324 | "The name by which to invoke Firefox or a variant of it." |
| 325 | :type 'string | 325 | :type 'string |
| 326 | :group 'browse-url) | 326 | :group 'browse-url) |
| 327 | 327 | ||
| 328 | (defcustom browse-url-firefox-arguments nil | 328 | (defcustom browse-url-firefox-arguments nil |
| 329 | "A list of strings to pass to Firefox as arguments." | 329 | "A list of strings to pass to Firefox (or variant) as arguments." |
| 330 | :type '(repeat (string :tag "Argument")) | 330 | :type '(repeat (string :tag "Argument")) |
| 331 | :group 'browse-url) | 331 | :group 'browse-url) |
| 332 | 332 | ||
| 333 | (defcustom browse-url-firefox-startup-arguments browse-url-firefox-arguments | 333 | (defcustom browse-url-firefox-startup-arguments browse-url-firefox-arguments |
| 334 | "A list of strings to pass to Firefox when it starts up. | 334 | "A list of strings to pass to Firefox (or variant) when it starts up. |
| 335 | Defaults to the value of `browse-url-firefox-arguments' at the time | 335 | Defaults to the value of `browse-url-firefox-arguments' at the time |
| 336 | `browse-url' is loaded." | 336 | `browse-url' is loaded." |
| 337 | :type '(repeat (string :tag "Argument")) | 337 | :type '(repeat (string :tag "Argument")) |