[Emacs-diffs] /srv/bzr/emacs/trunk r105901: newsticker: automatically load html rendering packages.

[Ulf Jasper]

------------------------------------------------------------
revno: 105901
committer: Ulf Jasper <address@hidden>
branch nick: trunk
timestamp: Sat 2011-09-24 16:04:46 +0200
message:
  newsticker: automatically load html rendering packages.
  
  lisp/ChangeLog:
  
  2011-09-24  Ulf Jasper  <address@hidden>
  
        * net/newst-reader.el (newsticker-html-renderer)
        (newsticker-show-news): Automatically load html rendering package
        if newsticker-html-renderer is set. Fixes "Warning: defvar ignored
        because w3m-fill-column is let-bound" and the error "Symbol's
        value as variable is void: w3m-fill-column".
modified:
  lisp/ChangeLog
  lisp/net/newst-reader.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-24 11:45:13 +0000
+++ b/lisp/ChangeLog    2011-09-24 14:04:46 +0000
@@ -1,3 +1,12 @@
+2011-09-24  Ulf Jasper  <address@hidden>
+
+       * net/newst-reader.el (newsticker-html-renderer)
+       (newsticker-show-news): Automatically
+       load html rendering package if newsticker-html-renderer is
+       set. Fixes "Warning: defvar ignored because w3m-fill-column is
+       let-bound" and the error "Symbol's value as variable is void:
+       w3m-fill-column".
+
 2011-09-24  Michael Albinus  <address@hidden>
 
        * net/dbus.el (dbus-unregister-object): Remove match rule of signals.

=== modified file 'lisp/net/newst-reader.el'
--- a/lisp/net/newst-reader.el  2011-05-13 19:06:36 +0000
+++ b/lisp/net/newst-reader.el  2011-09-24 14:04:46 +0000
@@ -5,7 +5,7 @@
 ;; Author:      Ulf Jasper <address@hidden>
 ;; Filename:    newst-reader.el
 ;; URL:         http://www.nongnu.org/newsticker
-;; Time-stamp:  "13. Mai 2011, 20:55:24 (ulf)"
+;; Time-stamp:  "24. September 2011, 15:47:49 (ulf)"
 ;; Package:     newsticker
 
 ;; ======================================================================
@@ -103,28 +103,11 @@
 (defcustom newsticker-html-renderer
   nil
   "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, for
-example, `w3m-region', `w3-region', and (if you have htmlr.el installed)
-`newsticker-htmlr-render'.
-
-In order to make sure that the HTML renderer is loaded when you
-run newsticker, you should add one of the following statements to
-your .emacs.  If you use w3m,
-
-  (autoload 'w3m-region \"w3m\"
-    \"Render region in current buffer and replace with result.\" t)
-
-  (autoload 'w3m-toggle-inline-image \"w3m\"
-    \"Toggle the visibility of an image under point.\" t)
-
-or, if you use w3,
-
-  (require 'w3-auto)
-
-or, if you use htmlr
-
-  (require 'htmlr)"
+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'.
+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 "w3" w3-region)
@@ -286,6 +269,14 @@
   "Start reading news.  You may want to bind this to a key."
   (interactive)
   (newsticker-start t) ;; will start only if not running
+  ;; Load the html rendering packages
+  (if newsticker-html-renderer
+      (cond ((eq newsticker-html-renderer 'w3m-region)
+             (require 'w3m))
+            ((eq newsticker-html-renderer 'w3-region)
+             (require 'w3-auto))
+            ((eq newsticker-html-renderer 'newsticker-htmlr-render)
+             (require 'htmlr))))
   (funcall newsticker-frontend))
 
 ;; ======================================================================