(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
(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)
(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)
(progn (beginning-of-line 2)
(point))
(point-max))))))
- (pgg-add-passphrase-cache
- (cdr (assq 'key-identifier packet))
- passphrase))))
+ (if pgg-cache-passphrase
+ (pgg-add-passphrase-cache
+ (cdr (assq 'key-identifier packet))
+ passphrase)))))
))
(luna-define-method verify-region ((scheme pgg-scheme-pgp5)
))
(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 "\""))))
(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