(mml1991-pgg-encrypt): Decode according to CTE before

encrypting.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5368162..2d4190a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,14 @@
+2003-12-28  Jesper Harder  <harder@ifa.au.dk>
+
+       * mml1991.el (mml1991-pgg-encrypt): Decode according to CTE before
+       encrypting.
+
 2003-12-28  Jesper Harder  <harder@ifa.au.dk>
 
        * mml1991.el (mml1991-pgg-sign): Use unibyte when re-encoding.
        From Ivan Boldyrev <boldyrev@uiggm.nsc.ru> (tiny change).
 
+
 2003-12-26  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * dgnushack.el: Add an advice to byte-optimize-form-code-walker to

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index aa67b82..50daea8 100644 (file)
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -255,12 +255,16 @@
     t))
 
 (defun mml1991-pgg-encrypt (cont &optional sign)
-  (let (headers)
+  (let (cte)
     ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED
     (goto-char (point-min))
-    (while (looking-at "^Content[^ ]+:") (forward-line))
+    (while (looking-at "^Content[^ ]+:")
+      (when (looking-at "^Content-Transfer-Encoding: \\(.+\\)")
+       (setq cte (intern (match-string 1))))
+      (forward-line))
     (unless (bobp)
       (delete-region (point-min) (point)))
+    (mm-decode-content-transfer-encoding cte)
     (unless (pgg-encrypt-region
             (point-min) (point-max) 
             (split-string