From: ueno <ueno>
Date: Sun, 31 Dec 2006 11:26:14 +0000 (+0000)
Subject: Reverted.
X-Git-Tag: epg-0_0_10~41
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a5f2177805aaa15bd4b13c14d805711817c465d;p=elisp%2Fepg.git

Reverted.
---

diff --git a/epa.el b/epa.el
index 7ff6747..25d8f67 100644
--- a/epa.el
+++ b/epa.el
@@ -979,7 +979,7 @@ If no one is selected, default secret key is used.  "
   (epa-sign-region start end signers mode))
 
 ;;;###autoload
-(defun epa-encrypt-region (start end recipients sign)
+(defun epa-encrypt-region (start end recipients)
   "Encrypt the current region between START and END for RECIPIENTS.
 
 Don't use this command in Lisp programs!"
@@ -992,9 +992,7 @@ Don't use this command in Lisp programs!"
      (list (region-beginning) (region-end)
 	   (epa-select-keys (epg-make-context epa-protocol)
 			    "Select recipients for encryption.
-If no one is selected, symmetric encryption will be performed.  ")
-	   (if current-prefix-arg
-		 (y-or-n-p "Sign? ")))))
+If no one is selected, symmetric encryption will be performed.  "))))
   (save-excursion
     (let ((context (epg-make-context epa-protocol))
 	  cipher)
@@ -1028,14 +1026,13 @@ If no one is selected, symmetric encryption will be performed.  ")
 				 'end-open t)))))
 
 ;;;###autoload
-(defun epa-encrypt (start end recipients sign)
+(defun epa-encrypt (start end recipients)
   "Encrypt the current buffer.
 
 Don't use this command in Lisp programs!"
   (interactive
    (save-excursion
-     (let ((verbose current-prefix-arg)
-	   recipients)
+     (let (recipients)
        (goto-char (point-min))
        (when (epa--mail-mode-p)
 	 (save-restriction
@@ -1060,7 +1057,7 @@ Don't use this command in Lisp programs!"
 	     (or coding-system-for-write
 		 (epa--select-safe-coding-system (point) (point-max))))
        (list (point) (point-max)
-	     (if verbose
+	     (if current-prefix-arg
 		 (epa-select-keys
 		  (epg-make-context epa-protocol)
 		  "Select recipients for encryption.
@@ -1074,10 +1071,8 @@ If no one is selected, symmetric encryption will be performed.  "
 				   (epg-list-keys
 				    (epg-make-context epa-protocol)
 				    (concat "<" recipient ">")))
-				 recipients)))))
-	     (if verbose
-		 (y-or-n-p "Sign? "))))))
-  (epa-encrypt-region start end recipients sign))
+				 recipients)))))))))
+  (epa-encrypt-region start end recipients))
 
 ;;;###autoload
 (defun epa-delete-keys (keys &optional allow-secret)