[Emacs-diffs] trunk r113155: * net/eww.el (eww-external-browser): Moved to shr.

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 113155
revision-id: address@hidden
parent: address@hidden
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2013-06-24 15:57:35 +0200
message:
  * net/eww.el (eww-external-browser): Moved to shr.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/eww.el                eww.el-20130610114603-80ap3gwnw4x4m5ix-1
  lisp/net/shr.el                shr.el-20101002102929-yfzewk55rsg0mn93-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-24 13:42:07 +0000
+++ b/lisp/ChangeLog    2013-06-24 13:57:35 +0000
@@ -1,3 +1,7 @@
+2013-06-24  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * net/eww.el (eww-external-browser): Moved to shr.
+
 2013-06-24  Ivan Kanis  <address@hidden>
 
        * net/eww.el (eww): Work more correctly for file: URLs.

=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el   2013-06-24 13:42:07 +0000
+++ b/lisp/net/eww.el   2013-06-24 13:57:35 +0000
@@ -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 @@
 
 (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)

=== modified file 'lisp/net/shr.el'
--- a/lisp/net/shr.el   2013-06-23 19:24:27 +0000
+++ b/lisp/net/shr.el   2013-06-24 13:57:35 +0000
@@ -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 @@
   :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