From: ueno <ueno>
Date: Sat, 11 Dec 1999 16:43:31 +0000 (+0000)
Subject: * smime.el (smime-encrypt-region): Delete entity header.
X-Git-Tag: emiko-1_13_8-tomo-1~7
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ff0f7076f9cd94ae1fb28812750448eabae13ae;p=elisp%2Fsemi.git

* smime.el (smime-encrypt-region): Delete entity header.
(smime-sign-region): Ditto.
---

diff --git a/smime.el b/smime.el
index 7746f87..8bd0ad8 100644
--- a/smime.el
+++ b/smime.el
@@ -183,7 +183,7 @@
 			  `(if (file-directory-p file) file nil)))
 		     (directory-files ,directory ,full ,match ,nosort)))
        `(directory-files ,directory ,full ,match ,nosort))))
-  (wrong-type-argument
+  (error
    (defalias 'smime-directory-files 'directory-files)))
 
 (defsubst smime-find-certificate (attr)
@@ -262,7 +262,11 @@
 	      (expand-file-name (read-file-name "Public key file: "))))
 	 (args (list "-e" key-file)))
     (smime-process-region start end smime-program args)
-    (smime-process-when-success nil)))
+    (smime-process-when-success 
+      (goto-char (point-min))
+      (delete-region (point-min) (progn
+				   (re-search-forward "^$" nil t)
+				   (1+ (point)))))))
 
 ;;;###autoload
 (defun smime-decrypt-region (start end)
@@ -295,6 +299,10 @@ a detached signature."
 	 (args (list "-ds" key-file passphrase)))
     (smime-process-region start end smime-program args)
     (smime-process-when-success 
+      (goto-char (point-min))
+      (delete-region (point-min) (progn
+				   (re-search-forward "^$" nil t)
+				   (1+ (point))))
       (when smime-cache-passphrase
 	(smime-add-passphrase-cache hash passphrase)))))