Synch with Oort Gnus.

[elisp/gnus.git-] / lisp / mml1991.el

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index da42eb5..ff44132 100644 (file)
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -230,12 +230,17 @@
       (forward-line) ;; skip header/body separator
       (kill-region (point-min) (point)))
     (quoted-printable-decode-region (point-min) (point-max))
-    (unless (let ((pgg-default-user-id (message-options-get 'message-sender)))
+    (unless (let ((pgg-default-user-id
+                  (or (message-options-get 'message-sender)
+                      pgg-default-user-id)))
              (pgg-sign-region (point-min) (point-max) t))
       (pop-to-buffer pgg-errors-buffer)
       (error "Encrypt error"))
     (kill-region (point-min) (point-max))
     (insert-buffer pgg-output-buffer)
+    (goto-char (point-min))
+    (while (re-search-forward "\r+$" nil t)
+      (replace-match "" t t))
     (quoted-printable-encode-region (point-min) (point-max))
     (goto-char (point-min))
     (if headers (insert headers))
@@ -244,14 +249,12 @@
 
 (defun mml1991-pgg-encrypt (cont &optional sign)
   (let (headers)
-    ;; Don't sign headers.
+    ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED
     (goto-char (point-min))
-    (while (not (looking-at "^$"))
-      (forward-line))
-    (unless (eobp) ;; no headers?
-      (setq headers (buffer-substring (point-min) (point)))
-      (forward-line) ;; skip header/body separator
-      (kill-region (point-min) (point)))
+    (while (looking-at "^Content[^ ]+:") (forward-line))
+    (if (> (point) (point-min))
+       (progn
+         (kill-region (point-min) (point))))
     (unless (pgg-encrypt-region
             (point-min) (point-max) 
             (split-string
@@ -264,7 +267,8 @@
       (pop-to-buffer pgg-errors-buffer)
       (error "Encrypt error"))
     (kill-region (point-min) (point-max))
-    (if headers (insert headers))
+    ;;(insert "Content-Type: application/pgp-encrypted\n\n")
+    ;;(insert "Version: 1\n\n")
     (insert "\n")
     (insert-buffer pgg-output-buffer)
     t))