From: Ulf Jasper Date: Sat, 24 Sep 2011 14:04:46 +0000 (+0200) Subject: newsticker: automatically load html rendering packages. X-Git-Tag: emacs-pretest-24.0.90~23 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2ac2721a7f792e5a85588dc402fe9670225be6e6;p=emacs.git newsticker: automatically load html rendering packages. lisp/ChangeLog: 2011-09-24 Ulf Jasper * 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". --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6f322d5f3bf..bf63cacf728 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2011-09-24 Ulf Jasper + + * 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 * net/dbus.el (dbus-unregister-object): Remove match rule of signals. diff --git a/lisp/net/newst-reader.el b/lisp/net/newst-reader.el index 1fbba29ec14..f9975c45fb3 100644 --- a/lisp/net/newst-reader.el +++ b/lisp/net/newst-reader.el @@ -5,7 +5,7 @@ ;; Author: Ulf Jasper ;; 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 @@ window is used when filling. See also `newsticker-justification'." (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 @@ Return the image." "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)) ;; ======================================================================