Mercurial > emacs
changeset 74864:e97d916ee47b
(allout-encrypt-string): Inhibit use of agent within
body of let form where encryption happens. Acknowledge non-use of
gpg-agent in docstring.
(allout-toggle-subtree-encryption): Acknowledge non-use of
gpg-agent in docstring.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 24 Dec 2006 01:08:43 +0000 |
| parents | e658329f448a |
| children | c6ab79f8c1ce |
| files | lisp/allout.el |
| diffstat | 1 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/allout.el Sun Dec 24 01:08:26 2006 +0000 +++ b/lisp/allout.el Sun Dec 24 01:08:43 2006 +0000 @@ -45,7 +45,9 @@ ;; - Symmetric-key and key-pair topic encryption, plus symmetric passphrase ;; mnemonic support, with verification against an established passphrase ;; (using a stashed encrypted dummy string) and user-supplied hint -;; maintenance. (See allout-toggle-current-subtree-encryption docstring.) +;; maintenance. (See allout-toggle-current-subtree-encryption docstring. +;; Currently only GnuPG encryption is supported, and integration +;; with gpg-agent is not yet implemented.) ;; - Automatic topic-number maintenance ;; - "Hot-spot" operation, for single-keystroke maneuvering and ;; exposure control (see the allout-mode docstring) @@ -5748,7 +5750,8 @@ passphrase cache. With no universal argument, the appropriate passphrase is obtained from the cache, if available, else from the user. -Currently only GnuPG encryption is supported. +Currently only GnuPG encryption is supported, and integration +with gpg-agent is not yet implemented. \**NOTE WELL** that the encrypted text must be ascii-armored. For gnupg encryption, include the option ``armor'' in your ~/.gnupg/gpg.conf file. @@ -5820,7 +5823,8 @@ passphrase cache. With no universal argument, the appropriate passphrase is obtained from the cache, if available, else from the user. -Currently only GnuPG encryption is supported. +Currently only GnuPG encryption is supported, and integration +with gpg-agent is not yet implemented. \**NOTE WELL** that the encrypted text must be ascii-armored. For gnupg encryption, include the option ``armor'' in your ~/.gnupg/gpg.conf file. @@ -5996,7 +6000,9 @@ (rejected (or rejected 0)) (rejections-left (- allout-encryption-ciphertext-rejection-ceiling rejected)) - result-text status) + result-text status + ;; Inhibit use of gpg-agent in the scope of this let: + (pgg-gpg-use-agent nil)) (if (and fetch-pass (not passphrase)) ;; Force later fetch by evicting passphrase from the cache.