From: ueno <ueno>
Date: Fri, 26 Nov 1999 06:29:42 +0000 (+0000)
Subject: * mime-edit.el (mime-edit-pgp-user-id): New variable.
X-Git-Tag: emiko-1_13_8~14
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=005b60091cd3824948a5c170c54b2aa4cb8e9f41;p=elisp%2Fsemi.git

* mime-edit.el (mime-edit-pgp-user-id): New variable.
(mime-edit-sign-pgp-mime): Undo last change; refer
`mime-edit-pgp-user-id'.
(mime-edit-encrypt-pgp-mime): Ditto.
---

diff --git a/mime-edit.el b/mime-edit.el
index 36ae247..7e2771c 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -1770,9 +1770,10 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))."
 	  )
 	(insert "\n")
 	(or (let ((pgg-default-user-id 
-		   (if (and from (not pgg-default-user-id))
-		       (nth 1 (std11-extract-address-components from))
-		     pgg-default-user-id)))
+		   (or mime-edit-pgp-user-id
+		       (if from 
+			   (nth 1 (std11-extract-address-components from))
+			 pgg-default-user-id))))
 	      (pgg-sign-region (point-min)(point-max)))
 	    (throw 'mime-edit-error 'pgp-error)
 	    )
@@ -1860,9 +1861,10 @@ Content-Transfer-Encoding: 7bit
           (insert "\n")
 	  (eword-encode-header)
 	  (or (let ((pgg-default-user-id 
-		     (if (and from (not pgg-default-user-id))
-			 (nth 1 (std11-extract-address-components from))
-		       pgg-default-user-id)))
+		     (or mime-edit-pgp-user-id
+			 (if from 
+			     (nth 1 (std11-extract-address-components from))
+			   pgg-default-user-id))))		     
 		(pgg-encrypt-region 
 		 (point-min) (point-max) 
 		 (mapcar (lambda (recipient)
@@ -2418,6 +2420,8 @@ Optional TRANSFER-LEVEL is a number of transfer-level, 7 or 8."
 (defvar mime-edit-pgp-processing nil)
 (make-variable-buffer-local 'mime-edit-pgp-processing)
 
+(defvar mime-edit-pgp-user-id nil)
+
 (defun mime-edit-set-sign (arg)
   (interactive
    (list