aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe Scrivano2011-06-25 11:31:24 +0200
committerGiuseppe Scrivano2011-06-25 11:31:24 +0200
commitf9ad64f3c162cef784e341e7316e42e25a9f03cc (patch)
tree97f99295521f7f8037a4a36a37dd7aad620a0824
parentcd3520a41df21d80a9d894c58af2daba23c8dd24 (diff)
downloademacs-f9ad64f3c162cef784e341e7316e42e25a9f03cc.tar.gz
emacs-f9ad64f3c162cef784e341e7316e42e25a9f03cc.zip
Add icecat to the firefox candidates list.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/browse-url.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index efb5e0ffad7..d95f9000217 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-06-25 Giuseppe Scrivano <gscrivano@gnu.org>
2
3 * net/browse-url.el (browse-url-firefox-program): Add icecat to
4 the candidates list.
5
12011-06-24 Juanma Barranquero <lekktu@gmail.com> 62011-06-24 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * progmodes/verilog-mode.el (verilog-mode): Fix test for bound variable. 8 * progmodes/verilog-mode.el (verilog-mode): Fix test for bound variable.
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index d9e6827d2df..ac12030471e 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -322,7 +322,7 @@ Defaults to the value of `browse-url-mozilla-arguments' at the time
322 :group 'browse-url) 322 :group 'browse-url)
323 323
324(defcustom browse-url-firefox-program 324(defcustom browse-url-firefox-program
325 (let ((candidates '("firefox" "iceweasel"))) 325 (let ((candidates '("firefox" "iceweasel" "icecat")))
326 (while (and candidates (not (executable-find (car candidates)))) 326 (while (and candidates (not (executable-find (car candidates))))
327 (setq candidates (cdr candidates))) 327 (setq candidates (cdr candidates)))
328 (or (car candidates) "firefox")) 328 (or (car candidates) "firefox"))