* pgg.el (pgg-save-coding-system): New macro.

[elisp/semi.git] / mime-edit.el

diff --git a/mime-edit.el b/mime-edit.el
index 0e8a511..2005b28 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -1847,6 +1847,7 @@ Content-Transfer-Encoding: 7bit
               (insert (format "Content-Transfer-Encoding: %s\n" encoding))
             )
           (insert "\n")
+         (eword-encode-header)
          (or (let ((pgg-default-user-id 
                     (if from
                         (nth 1 (std11-extract-address-components from))
@@ -2413,15 +2414,14 @@ Optional TRANSFER-LEVEL is a number of transfer-level, 7 or 8."
     ))
   (if arg
       (progn
-       (setq mime-edit-pgp-processing 
-             (nconc mime-edit-pgp-processing 
-                    (copy-sequence '(sign))))
+       (or (memq 'sign mime-edit-pgp-processing)
+           (setq mime-edit-pgp-processing 
+                 (nconc mime-edit-pgp-processing 
+                        (copy-sequence '(sign)))))
        (message "This message will be signed.")
        )
-    (if (eq (car (last mime-edit-pgp-processing)) 'sign)
-       (setq mime-edit-pgp-processing 
-             (butlast mime-edit-pgp-processing))
-      )
+    (setq mime-edit-pgp-processing 
+         (delq 'sign mime-edit-pgp-processing))
     (message "This message will not be signed.")
     ))
 
@@ -2432,15 +2432,14 @@ Optional TRANSFER-LEVEL is a number of transfer-level, 7 or 8."
     ))
   (if arg
       (progn
-       (setq mime-edit-pgp-processing 
-             (nconc mime-edit-pgp-processing 
-                    (copy-sequence '(encrypt))))
+       (or (memq 'encrypt mime-edit-pgp-processing)
+           (setq mime-edit-pgp-processing 
+                 (nconc mime-edit-pgp-processing 
+                        (copy-sequence '(encrypt)))))
        (message "This message will be encrypt.")
        )
-    (if (eq (car (last mime-edit-pgp-processing)) 'encrypt)
-       (setq mime-edit-pgp-processing
-             (butlast mime-edit-pgp-processing))
-      )
+    (setq mime-edit-pgp-processing
+         (delq 'encrypt mime-edit-pgp-processing))
     (message "This message will not be encrypt.")
     ))