* lisp/net/newst-reader.el (newsticker-html-renderer): Default to SHR if

available.  Suggested by Clément B. <barthele1u@etu.univ-lorraine.fr>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b40773904bf4466b524ddc1d0f7623831b9c44e0..26c0f50233404cbaa98943d03589a5ca873bf1b0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-11-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * net/newst-reader.el (newsticker-html-renderer): Default to SHR if
+       available.  Suggested by Clément B. <barthele1u@etu.univ-lorraine.fr>.
+
        * uniquify.el (uniquify-buffer-name-style): Change default.
 
        * loadup.el: Preload "uniquify".

diff --git a/lisp/net/newst-reader.el b/lisp/net/newst-reader.el
index 21bb890f742ddd97cf5b3f8de7457c473f6daf1e..4d2e0118ac033bede139ddc47ee47436245932c7 100644 (file)
--- 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'."
   :group 'newsticker-reader)
 
 (defcustom newsticker-html-renderer
-  nil
+  (if (fboundp 'libxml-parse-html-region)
+      #'shr-render-region)
   "Function for rendering HTML contents.
 If non-nil, newsticker.el will call this function whenever it
-finds HTML-like tags in item descriptions.  Possible functions
-are `w3m-region', `w3-region', and `newsticker-htmlr-render'.
+finds HTML-like tags in item descriptions.  
+Possible functions include `shr-render-region', `w3m-region', `w3-region', and
+`newsticker-htmlr-render'.
 Newsticker automatically loads the respective package w3m, w3, or
 htmlr if this option is set."
   :type '(choice :tag "Function"
                  (const :tag "None" nil)
+                 (const :tag "SHR" shr-render-region)
                  (const :tag "w3" w3-region)
                  (const :tag "w3m" w3m-region)
                  (const :tag "htmlr" newsticker-htmlr-render))