Make the default browser choice a bit more logical

* net/browse-url.el (browse-url-default-browser)
(browse-url-browser-function): Make the default browser choice a
bit more logical.  Also clean up the doc string.

Fixes: debbugs:4300

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fdc84cf51acfbeecf757799774c54e6436c37df2..3baec994c6edc54c7f1f1b3a8dded7e94866b7e1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-13  Lawrence Mitchell  <wence@gmx.li>
+
+       * net/browse-url.el (browse-url-default-browser)
+       (browse-url-browser-function): Make the default browser choice a
+       bit more logical (bug#4300).  Also clean up the doc string.
+
 2011-07-13  Juanma Barranquero  <lekktu@gmail.com>
 
        * bindings.el (completion-ignored-extensions): Add OpenMCL/Clozure

diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index ac12030471ebc56e84d3aca62ca99d43ae8bb0ad..e18b42a275f72b7364938efcf789bbbf70f49fb6 100644 (file)
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -214,13 +214,7 @@
 
 ;;;###autoload
 (defcustom browse-url-browser-function
-  (cond
-   ((memq system-type '(windows-nt ms-dos cygwin))
-    'browse-url-default-windows-browser)
-   ((memq system-type '(darwin))
-    'browse-url-default-macosx-browser)
-   (t
-    'browse-url-default-browser))
+  'browse-url-default-browser
   "Function to display the current buffer in a WWW browser.
 This is used by the `browse-url-at-point', `browse-url-at-mouse', and
 `browse-url-of-file' commands.
@@ -908,12 +902,13 @@ a random existing one.  A non-nil interactive prefix argument reverses
 the effect of `browse-url-new-window-flag'.
 
 When called non-interactively, optional second argument NEW-WINDOW is
-used instead of `browse-url-new-window-flag'.
-
-The order attempted is gnome-moz-remote, Mozilla, Firefox,
-Galeon, Konqueror, Netscape, Mosaic, Lynx in an xterm, and then W3."
+used instead of `browse-url-new-window-flag'."
   (apply
    (cond
+    ((memq system-type '(windows-nt ms-dos cygwin))
+     'browse-url-default-windows-browser)
+    ((memq system-type '(darwin))
+     'browse-url-default-macosx-browser)
     ((browse-url-can-use-xdg-open) 'browse-url-xdg-open)
     ((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz)
     ((executable-find browse-url-mozilla-program) 'browse-url-mozilla)