aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2013-11-29 16:35:00 -0500
committerStefan Monnier2013-11-29 16:35:00 -0500
commit7784b779b8f06e8e88582464c65a0c5e15c0eeb5 (patch)
tree8251d78361234197da071e479ca84d2b4537a2ed
parent04445382cf67bdd47af5ff2f2c6fa9c910d46b17 (diff)
downloademacs-7784b779b8f06e8e88582464c65a0c5e15c0eeb5.tar.gz
emacs-7784b779b8f06e8e88582464c65a0c5e15c0eeb5.zip
* lisp/net/newst-reader.el (newsticker-html-renderer): Default to SHR if
available. Suggested by Clément B. <barthele1u@etu.univ-lorraine.fr>.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/net/newst-reader.el9
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b40773904bf..26c0f502334 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12013-11-29 Stefan Monnier <monnier@iro.umontreal.ca> 12013-11-29 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * net/newst-reader.el (newsticker-html-renderer): Default to SHR if
4 available. Suggested by Clément B. <barthele1u@etu.univ-lorraine.fr>.
5
3 * uniquify.el (uniquify-buffer-name-style): Change default. 6 * uniquify.el (uniquify-buffer-name-style): Change default.
4 7
5 * loadup.el: Preload "uniquify". 8 * loadup.el: Preload "uniquify".
diff --git a/lisp/net/newst-reader.el b/lisp/net/newst-reader.el
index 21bb890f742..4d2e0118ac0 100644
--- a/lisp/net/newst-reader.el
+++ b/lisp/net/newst-reader.el
@@ -101,15 +101,18 @@ window is used when filling. See also `newsticker-justification'."
101 :group 'newsticker-reader) 101 :group 'newsticker-reader)
102 102
103(defcustom newsticker-html-renderer 103(defcustom newsticker-html-renderer
104 nil 104 (if (fboundp 'libxml-parse-html-region)
105 #'shr-render-region)
105 "Function for rendering HTML contents. 106 "Function for rendering HTML contents.
106If non-nil, newsticker.el will call this function whenever it 107If non-nil, newsticker.el will call this function whenever it
107finds HTML-like tags in item descriptions. Possible functions 108finds HTML-like tags in item descriptions.
108are `w3m-region', `w3-region', and `newsticker-htmlr-render'. 109Possible functions include `shr-render-region', `w3m-region', `w3-region', and
110`newsticker-htmlr-render'.
109Newsticker automatically loads the respective package w3m, w3, or 111Newsticker automatically loads the respective package w3m, w3, or
110htmlr if this option is set." 112htmlr if this option is set."
111 :type '(choice :tag "Function" 113 :type '(choice :tag "Function"
112 (const :tag "None" nil) 114 (const :tag "None" nil)
115 (const :tag "SHR" shr-render-region)
113 (const :tag "w3" w3-region) 116 (const :tag "w3" w3-region)
114 (const :tag "w3m" w3m-region) 117 (const :tag "w3m" w3m-region)
115 (const :tag "htmlr" newsticker-htmlr-render)) 118 (const :tag "htmlr" newsticker-htmlr-render))