diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2013-06-24 15:57:35 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2013-06-24 15:57:35 +0200 |
| commit | 0ebd92a3e9a766510a987ee0548c30f5d35a5e52 (patch) | |
| tree | 245db75b988d473a33a97b0eca06292ff92f3ee8 /lisp | |
| parent | b89fc1569bbf5bcd5cb3d09fc4b49dfa6d2acf89 (diff) | |
| download | emacs-0ebd92a3e9a766510a987ee0548c30f5d35a5e52.tar.gz | |
* net/eww.el (eww-external-browser): Moved to shr.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/eww.el | 16 | ||||
| -rw-r--r-- | lisp/net/shr.el | 8 |
3 files changed, 13 insertions, 15 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 03a03e1d8c3..c3300fe645c 100644 --- 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 2aab8e40deb..535992513a2 100644 --- 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 979743f9588..7c48ceeee80 100644 --- 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 |