Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3284b1..e78a617 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,16 @@
 2001-10-16  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+       From Katsumi Yamaoka  <yamaoka@jpl.org>.
+
+       * message.el (message-setup-fill-variables): Use
+       `normal-auto-fill-function' instead of `auto-fill-function'.
+
+2001-10-16  Simon Josefsson  <jas@extundo.com>
+
+       * mml2015.el (mml2015-fix-micalg): Fix for Mutt-bug.
+       (mml2015-gpg-decrypt-1): Decanonicalize decrypted MIME
+       body. (Mailcrypt seem to do this, but gpg.el doesn't.)
+
+2001-10-16  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
        Patch by Oliver Scholz <oscholz@my.gnus.org>.
 
        * gnus-draft.el (gnus-draft-edit-message): Add text property

diff --git a/lisp/message.el b/lisp/message.el
index 99b1823..d6f446c 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1876,6 +1876,7 @@ M-RET    `message-newline-and-reformat' (break the line and reformat)."
     (setq adaptive-fill-first-line-regexp nil))
   (make-local-variable 'adaptive-fill-first-line-regexp)
   (make-local-variable 'auto-fill-inhibit-regexp)
+  (make-local-variable 'normal-auto-fill-function)
   (let ((quote-prefix-regexp
         ;; User should change message-cite-prefix-regexp if
         ;; message-yank-prefix is set to an abnormal value.
@@ -1897,7 +1898,7 @@ M-RET    `message-newline-and-reformat' (break the line and reformat)."
                  adaptive-fill-first-line-regexp))
     ;;(setq auto-fill-inhibit-regexp "^[A-Z][^: \n\t]+:")
     (setq auto-fill-inhibit-regexp nil)
-    (setq auto-fill-function 'message-do-auto-fill)))
+    (setq normal-auto-fill-function 'message-do-auto-fill)))
 
 \f
 

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index a16a4e5..a59ff3f 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -150,7 +150,8 @@ by you.")
 
 (defun mml2015-fix-micalg (alg)
   (and alg
-       (upcase (if (string-match "^pgp-" alg)
+       ;; Mutt/1.2.5i has seen sending micalg=php-sha1
+       (upcase (if (string-match "^p[gh]p-" alg)
                   (substring alg (match-end 0))
                 alg))))
 
@@ -362,7 +363,10 @@ by you.")
               (buffer-string)))
            (set-buffer cipher)
            (erase-buffer)
-           (insert-buffer plain)))
+           (insert-buffer plain)
+           (goto-char (point-min))
+           (while (search-forward "\r\n" nil t)
+             (replace-match "\n" t t))))
        '(t)
       ;; Some wrong with the return value, check plain text buffer.
       (if (> (point-max) (point-min))