From bce1a9f058825ecfaa206879d688c61642c2fca6 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 27 Jan 2004 21:56:50 +0000 Subject: [PATCH] Synch to No Gnus 200401272147. --- lisp/ChangeLog | 11 +++++++++++ lisp/mm-view.el | 10 ++++++++-- lisp/spam.el | 4 ++-- texi/ChangeLog | 4 ++++ texi/emacs-mime.texi | 8 ++++++-- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 05ee898..413ac43 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2004-01-27 Simon Josefsson + + * mm-view.el (mm-fill-flowed): Add. + (mm-inline-text): Use it. Tiny patch from Ralf Angeli + . + +2004-01-27 Teodor Zlatanov + + * spam.el (spam-spamassassin-register-ham-routine) + (spam-spamassassin-register-spam-routine): fixed function names + 2004-01-27 Katsumi Yamaoka * gnus.el (gnus-tmp-grouplens): Remove. diff --git a/lisp/mm-view.el b/lisp/mm-view.el index baff3db..6e4b3d2 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -1,5 +1,5 @@ ;;; mm-view.el --- functions for viewing MIME objects -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; This file is part of GNU Emacs. @@ -64,6 +64,11 @@ (html2text html2text)) "The attributes of washer types for text/html.") +(defcustom mm-fill-flowed t + "If non-nil an format=flowed article will be displayed flowed." + :type 'boolean + :group 'mime-display) + ;;; Internal variables. ;;; @@ -345,7 +350,8 @@ (mm-insert-part handle) (goto-char (point-max))) (insert (mm-decode-string (mm-get-part handle) charset))) - (when (and (equal type "plain") + (when (and mm-fill-flowed + (equal type "plain") (equal (cdr (assoc 'format (mm-handle-type handle))) "flowed")) (save-restriction diff --git a/lisp/spam.el b/lisp/spam.el index 451a340..eb9c8b2 100644 --- a/lisp/spam.el +++ b/lisp/spam.el @@ -2097,10 +2097,10 @@ REMOVE not nil, remove the ADDRESSES." (defun spam-spamassassin-register-ham-routine (articles &optional unregister) (spam-spamassassin-register-with-sa-learn articles nil unregister)) -(defun spam-assassin-register-spam-routine (articles) +(defun spam-spamassassin-unregister-spam-routine (articles) (spam-spamassassin-register-with-sa-learn articles t t)) -(defun spam-assassin-register-ham-routine (articles) +(defun spam-spamassassin-unregister-ham-routine (articles) (spam-spamassassin-register-with-sa-learn articles nil t)) ;;;; Hooks diff --git a/texi/ChangeLog b/texi/ChangeLog index 665e78d..ff22572 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2004-01-27 Simon Josefsson + + * emacs-mime.texi (Flowed text): Add. + 2004-01-23 Teodor Zlatanov * gnus.texi (Spam ELisp Package Filtering of Incoming Mail): diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi index 8c51bde..93c676f 100644 --- a/texi/emacs-mime.texi +++ b/texi/emacs-mime.texi @@ -18,7 +18,7 @@ This file documents the Emacs MIME interface functionality. -Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 +Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document @@ -972,7 +972,11 @@ together and wrapped after the column decided by @code{fill-flowed-display-column}. The default is to wrap after @code{fill-column}. - +@table @code +@item mm-fill-flowed +@findex mm-fill-flowed +If non-nil an format=flowed article will be displayed flowed. +@end table @node Interface Functions -- 1.7.10.4