* mml1991.el (mml1991-pgg-encrypt): Remove headers.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 71a43c3..7d30595 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2002-10-10  Simon Josefsson  <jas@extundo.com>
 
+       * mml1991.el (mml1991-pgg-encrypt): Remove headers.
+
        * mml.el (mml-parse-1): Support sender in #secure tags.
 
        * mml1991.el (mml1991-pgg-sign): Only use message-sender if it is

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index ea2679e..538319c 100644 (file)
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -24,7 +24,7 @@
 
 ;;; Commentary:
 
-;; RCS: $Id: mml1991.el,v 6.13 2002/10/09 23:27:32 jas Exp $
+;; RCS: $Id: mml1991.el,v 6.14 2002/10/10 00:30:36 jas Exp $
 
 ;;; Code:
 
@@ -248,14 +248,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
@@ -268,7 +266,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))