* net/eww.el (eww-external-browser): Moved to shr.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 03a03e1d8c354347b27d897e1f45ba3e50106e7e..c3300fe645c8d95cce9bec94134ca61f962f6adf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-24  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * net/eww.el (eww-external-browser): Moved to shr.
+
 2013-06-24  Ivan Kanis  <ivan@kanis.fr>
 
        * net/eww.el (eww): Work more correctly for file: URLs.

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 2aab8e40deb9401e614be2aeaabe3b2946f45059..535992513a26ded3f5d7f0eb72e1f78eba512350 100644 (file)
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -50,18 +50,6 @@
   :group 'eww
   :type 'string)
 
-(defcustom eww-external-browser
-  (cond ((eq system-type 'windows-nt)
-        'browse-url-default-windows-browser)
-       ((eq system-type 'darwin)
-        'browse-url-default-macosx-browser)
-       (t
-        'browse-url-netscape))
-  "Function used to launch an external browser."
-  :version "24.4"
-  :group 'eww
-  :type 'function)
-
 (defface eww-form-submit
   '((((type x w32 ns) (class color))   ; Like default mode line
      :box (:line-width 2 :style released-button)
@@ -845,9 +833,9 @@ appears in a <link> or <a> tag."
 
 (defun eww-browse-with-external-browser ()
   "Browse the current URL with an external browser.
-The browser to used is specified by the `eww-external-browser' variable."
+The browser to used is specified by the `shr-external-browser' variable."
   (interactive)
-  (funcall eww-external-browser eww-current-url))
+  (funcall shr-external-browser eww-current-url))
 
 (defun eww-yank-page-url ()
   (interactive)

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 979743f95882bc7d21eff1fd84edee29e9230813..7c48ceeee80fe185c23c93180804899fd7229d27 100644 (file)
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -37,7 +37,7 @@
 (defgroup shr nil
   "Simple HTML Renderer"
   :version "24.1"
-  :group 'mail)
+  :group 'hypermedia)
 
 (defcustom shr-max-image-proportion 0.9
   "How big pictures displayed are in relation to the window they're in.
@@ -93,6 +93,12 @@ Alternative suggestions are:
   :type 'string
   :group 'shr)
 
+(defcustom shr-external-browser 'browse-url-default-browser
+  "Function used to launch an external browser."
+  :version "24.4"
+  :group 'shr
+  :type 'function)
+
 (defvar shr-content-function nil
   "If bound, this should be a function that will return the content.
 This is used for cid: URLs, and the function is called with the