procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* net/browse-url.el (browse-url-firefox-program): Use iceweasel if

Browse source 
firefox is absent.  Don't autoload.
(browse-url-galeon-program): Don't autoload.
This commit is contained in:
Stefan Monnier 2010-04-29 10:04:33 -04:00
parent d6d2385247
commit 7d353d11ce
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -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.

10
lisp/net/browse-url.el
View file

@ -313,8 +313,11 @@ Defaults to the value of `browse-url-mozilla-arguments' at the time
: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 @@ Defaults to the value of `browse-url-firefox-arguments' at the time
: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)