diff options
author | Ulf Jasper <ulf.jasper@web.de> | 2011-09-24 16:04:46 +0200 |
---|---|---|
committer | Ulf Jasper <ulf.jasper@web.de> | 2011-09-24 16:04:46 +0200 |
commit | 2ac2721a7f792e5a85588dc402fe9670225be6e6 (patch) | |
tree | f3640eaddaa9ac5f53160071f4aa7beab4363d96 /lisp/net/newst-reader.el | |
parent | e3cbd34b8793d52fb3252c8e0406bc5d67c2db44 (diff) | |
download | emacs-2ac2721a7f792e5a85588dc402fe9670225be6e6.tar.gz |
newsticker: automatically load html rendering packages.
lisp/ChangeLog:
2011-09-24 Ulf Jasper <ulf.jasper@web.de>
* 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".
Diffstat (limited to 'lisp/net/newst-reader.el')
-rw-r--r-- | lisp/net/newst-reader.el | 37 |
1 files changed, 14 insertions, 23 deletions
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 <ulf.jasper@web.de> ;; 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)) ;; ====================================================================== |