From b90a614915352447f3b5de4f17d304ac7813bcfd Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Sun, 29 Oct 2006 07:36:46 +0000 Subject: Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 156-159) - Merge from emacs--devo--0 - Update from CVS 2006-10-29 Katsumi Yamaoka * lisp/gnus/gnus-sum.el (gnus-set-mode-line): Quote % in group name. 2006-10-28 Reiner Steib * lisp/gnus/gnus-agent.el (gnus-agent-make-mode-line-string): Make it compatible with Emacs 21 and XEmacs. 2006-10-26 Reiner Steib * lisp/gnus/mm-view.el: Add interactive arg to html2text autoload. 2006-10-25 Katsumi Yamaoka * lisp/gnus/gnus-sum.el (gnus-summary-move-article): Use no-encode for `B B'. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-487 --- lisp/gnus/mm-view.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/gnus/mm-view.el') diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el index 5972a0681a6..8b6d3e8e795 100644 --- a/lisp/gnus/mm-view.el +++ b/lisp/gnus/mm-view.el @@ -36,7 +36,7 @@ (autoload 'vcard-parse-string "vcard") (autoload 'vcard-format-string "vcard") (autoload 'fill-flowed "flow-fill") - (autoload 'html2text "html2text") + (autoload 'html2text "html2text" nil t) (unless (fboundp 'diff-mode) (autoload 'diff-mode "diff-mode" "" t nil))) -- cgit v1.2.1