2001-10-30 23:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

[gnus] / lisp / mml2015.el

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index ed385bc..5989e3f 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -149,7 +149,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))))
 
@@ -361,7 +362,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))
@@ -440,6 +444,16 @@ by you.")
       (with-temp-buffer
        (setq message (current-buffer))
        (insert part)
+       ;; Convert <LF> to <CR><LF> in verify mode.  Sign and
+       ;; clearsign use --textmode. The conversion is not necessary.
+       ;; In clearverify, the conversion is not necessary either.
+       (goto-char (point-min))
+       (end-of-line)
+       (while (not (eobp))
+         (unless (eq (char-before) ?\r)
+           (insert "\r"))
+         (forward-line)
+         (end-of-line))
        (with-temp-buffer
          (setq signature (current-buffer))
          (unless (setq part (mm-find-part-by-type