[Emacs-diffs] /srv/bzr/emacs/trunk r105159: Make the default browser choice a bit more logical

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105159
fixes bug(s): http://debbugs.gnu.org/4300
author: Lawrence Mitchell <address@hidden>
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Wed 2011-07-13 15:49:55 +0200
message:
  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.
modified:
  lisp/ChangeLog
  lisp/net/browse-url.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-13 13:39:23 +0000
+++ b/lisp/ChangeLog    2011-07-13 13:49:55 +0000
@@ -1,3 +1,9 @@
+2011-07-13  Lawrence Mitchell  <address@hidden>
+
+       * 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  <address@hidden>
 
        * bindings.el (completion-ignored-extensions): Add OpenMCL/Clozure

=== modified file 'lisp/net/browse-url.el'
--- a/lisp/net/browse-url.el    2011-06-25 09:31:24 +0000
+++ b/lisp/net/browse-url.el    2011-07-13 13:49:55 +0000
@@ -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 @@
 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)