From e0939df3d61142aee8bd8d204da22738a9d288b4 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Wed, 20 Oct 2010 18:44:36 +0200 Subject: [PATCH] Remove gnus-article-wash-function, and use `mm-text-html-renderer' instead. --- lisp/ChangeLog | 1 + lisp/gnus-art.el | 5 +---- texi/gnus.texi | 5 +---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 33e55c63d..472368100 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -2,6 +2,7 @@ * gnus-art.el (gnus-blocked-images): New function. Allow the `gnus-blocked-images' to be a function. + (gnus-article-wash-function): Removed. 2010-10-20 Julien Danjou diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index f42838d08..cf3917613 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -1621,9 +1621,6 @@ It is a string, such as \"PGP\". If nil, ask user." :type 'string :group 'mime-security) -(defvar gnus-article-wash-function nil - "Function used for converting HTML into text.") - (defcustom gnus-use-idna (and (condition-case nil (require 'idna) (file-error)) (mm-coding-system-p 'utf-8) (executable-find idna-program)) @@ -2732,7 +2729,7 @@ charset defined in `gnus-summary-show-article-charset-alist' is used." (save-window-excursion (save-restriction (narrow-to-region (point) (point-max)) - (let* ((func (or gnus-article-wash-function mm-text-html-renderer)) + (let* ((func mm-text-html-renderer) (entry (assq func mm-text-html-washer-alist))) (when entry (setq func (cdr entry))) diff --git a/texi/gnus.texi b/texi/gnus.texi index 337e85cf1..7242f604f 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -9803,13 +9803,10 @@ If a prefix is given, a charset will be asked for. If it is a number, the charset defined in @code{gnus-summary-show-article-charset-alist} (@pxref{Paging the Article}) will be used. -@vindex gnus-article-wash-function The default is to use the function specified by @code{mm-text-html-renderer} (@pxref{Display Customization, ,Display Customization, emacs-mime, The Emacs MIME Manual}) to convert the -@acronym{HTML}, but this is controlled by the -@code{gnus-article-wash-function} variable. Pre-defined functions you -can use include: +@acronym{HTML}. Pre-defined functions you can use include: @table @code @item mm-shr -- 2.25.1