X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pgg-pgp5.el;h=e8066fbd9a7488899702319ef4cd9633d4b2dfed;hb=8dc29f35456a0c1f51e7282bf0e9b1e6497343c6;hp=fc8566e504bce13c8429e03b00896363f0b6458d;hpb=d6855c5e8828e26638ea79bab7f9835e93c771fa;p=elisp%2Fsemi.git

diff --git a/pgg-pgp5.el b/pgg-pgp5.el
index fc8566e..e8066fb 100644
--- a/pgg-pgp5.el
+++ b/pgg-pgp5.el
@@ -153,7 +153,7 @@
 
 (luna-define-method encrypt-region ((scheme pgg-scheme-pgp5) 
 				    start end recipients)
-  (let* ((pgg-pgp5-user-id pgg-default-user-id)
+  (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
 	 (args 
 	  `("+NoBatchInvalidKeys=off" "-fat" "+batchmode=1"
 	    ,@(if recipients
@@ -172,7 +172,7 @@
 
 (luna-define-method decrypt-region ((scheme pgg-scheme-pgp5) 
 				    start end)
-  (let* ((pgg-pgp5-user-id pgg-default-user-id)
+  (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
 	 (passphrase
 	  (pgg-read-passphrase 
 	   (format "PGP passphrase for %s: " pgg-pgp5-user-id)
@@ -187,7 +187,7 @@
 
 (luna-define-method sign-region ((scheme pgg-scheme-pgp5) 
 				 start end &optional clearsign)
-  (let* ((pgg-pgp5-user-id pgg-default-user-id)
+  (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
 	 (passphrase
 	  (pgg-read-passphrase 
 	   (format "PGP passphrase for %s: " pgg-pgp5-user-id)
@@ -236,7 +236,7 @@
     ))
 
 (luna-define-method insert-key ((scheme pgg-scheme-pgp5))
-  (let* ((pgg-pgp5-user-id pgg-default-user-id)
+  (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
 	 (args
 	  (list "+verbose=1" "+batchmode=1" "+language=us" "-x" 
 		(concat "\"" pgg-pgp5-user-id "\""))))
@@ -247,7 +247,7 @@
 
 (luna-define-method snarf-keys-region ((scheme pgg-scheme-pgp5)
 				       start end)
-  (let* ((pgg-pgp5-user-id pgg-default-user-id)
+  (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
 	 (basename (expand-file-name "pgg" temporary-file-directory))
 	 (key-file (make-temp-name basename))
 	 (args