summaryrefslogtreecommitdiff
path: root/lisp/gnus/nnrss.el
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org>2010-10-20 22:29:38 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2010-10-20 22:29:38 +0000
commit2526f423795632d123f3cd99e9aa45065b41745b (patch)
tree8796b5340305c0fbba5ab323cedb6ee4e369af2c /lisp/gnus/nnrss.el
parent4bfb8dec36751543c5ba254d8a69685d39295615 (diff)
downloademacs-2526f423795632d123f3cd99e9aa45065b41745b.tar.gz
emacs-2526f423795632d123f3cd99e9aa45065b41745b.tar.bz2
emacs-2526f423795632d123f3cd99e9aa45065b41745b.zip
Merge changes made in Gnus trunk.
nnimap.el (nnimap-insert-partial-structure): Fix boundary detection. spam.el (spam-list-of-processors): Mark as obsolete. gnus-art.el (gnus-blocked-images): New function. Allow the `gnus-blocked-images' to be a function. gnus-art.el (gnus-article-wash-function): Remove it, and use `mm-text-html-renderer' instead. mm-decode.el (mm-inline-text-html-renderer): Removed. mm-decode.el (mm-inline-media-tests): Removed use. mm-view.el (mm-inline-text-html): Removed use. mm-view.el (mm-text-html-renderer-alist): Add the `shr' and `gnus-w3m' symbols. gnus.texi (Article Washing): shr and gnus-w3m, not the direct function names. gnus-art.el (article-wash-html): Simplify and remove the charset stuff. Use the normal html rendering code instead of the special html washing code. mm-view.el (mm-text-html-washer-alist): Removed. gnus-news.texi: Mention that mm-text-html-renderer is the only HTML variable now. shr.el (shr-tag-table): Remove useless nconc.
Diffstat (limited to 'lisp/gnus/nnrss.el')
-rw-r--r--lisp/gnus/nnrss.el1
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el
index ebe8c514cb3..e3ce6db7c56 100644
--- a/lisp/gnus/nnrss.el
+++ b/lisp/gnus/nnrss.el
@@ -198,7 +198,6 @@ used to render text. If it is nil, text will simply be folded.")
t)
(defvar mm-text-html-renderer)
-(defvar mm-text-html-washer-alist)
(deffoo nnrss-request-article (article &optional group server buffer)
(setq group (nnrss-decode-group-name group))