Mercurial > emacs
comparison lisp/allout.el @ 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 | cba6f2b24720 |
children | 3a115c11d329 |
comparison
equal
deleted
inserted
replaced
74863:e658329f448a | 74864:e97d916ee47b |
---|---|
43 ;; file was visited - see `enable-local-variables'.) | 43 ;; file was visited - see `enable-local-variables'.) |
44 ;; - Configurable per-file initial exposure settings | 44 ;; - Configurable per-file initial exposure settings |
45 ;; - Symmetric-key and key-pair topic encryption, plus symmetric passphrase | 45 ;; - Symmetric-key and key-pair topic encryption, plus symmetric passphrase |
46 ;; mnemonic support, with verification against an established passphrase | 46 ;; mnemonic support, with verification against an established passphrase |
47 ;; (using a stashed encrypted dummy string) and user-supplied hint | 47 ;; (using a stashed encrypted dummy string) and user-supplied hint |
48 ;; maintenance. (See allout-toggle-current-subtree-encryption docstring.) | 48 ;; maintenance. (See allout-toggle-current-subtree-encryption docstring. |
49 ;; Currently only GnuPG encryption is supported, and integration | |
50 ;; with gpg-agent is not yet implemented.) | |
49 ;; - Automatic topic-number maintenance | 51 ;; - Automatic topic-number maintenance |
50 ;; - "Hot-spot" operation, for single-keystroke maneuvering and | 52 ;; - "Hot-spot" operation, for single-keystroke maneuvering and |
51 ;; exposure control (see the allout-mode docstring) | 53 ;; exposure control (see the allout-mode docstring) |
52 ;; - Easy rendering of exposed portions into numbered, latex, indented, etc | 54 ;; - Easy rendering of exposed portions into numbered, latex, indented, etc |
53 ;; outline styles | 55 ;; outline styles |
5746 single universal argument. With doubled universal argument (value = 16), | 5748 single universal argument. With doubled universal argument (value = 16), |
5747 it forces prompting for the passphrase regardless of availability from the | 5749 it forces prompting for the passphrase regardless of availability from the |
5748 passphrase cache. With no universal argument, the appropriate passphrase | 5750 passphrase cache. With no universal argument, the appropriate passphrase |
5749 is obtained from the cache, if available, else from the user. | 5751 is obtained from the cache, if available, else from the user. |
5750 | 5752 |
5751 Currently only GnuPG encryption is supported. | 5753 Currently only GnuPG encryption is supported, and integration |
5754 with gpg-agent is not yet implemented. | |
5752 | 5755 |
5753 \**NOTE WELL** that the encrypted text must be ascii-armored. For gnupg | 5756 \**NOTE WELL** that the encrypted text must be ascii-armored. For gnupg |
5754 encryption, include the option ``armor'' in your ~/.gnupg/gpg.conf file. | 5757 encryption, include the option ``armor'' in your ~/.gnupg/gpg.conf file. |
5755 | 5758 |
5756 Both symmetric-key and key-pair encryption is implemented. Symmetric is | 5759 Both symmetric-key and key-pair encryption is implemented. Symmetric is |
5818 single universal argument. With doubled universal argument (value = 16), | 5821 single universal argument. With doubled universal argument (value = 16), |
5819 it forces prompting for the passphrase regardless of availability from the | 5822 it forces prompting for the passphrase regardless of availability from the |
5820 passphrase cache. With no universal argument, the appropriate passphrase | 5823 passphrase cache. With no universal argument, the appropriate passphrase |
5821 is obtained from the cache, if available, else from the user. | 5824 is obtained from the cache, if available, else from the user. |
5822 | 5825 |
5823 Currently only GnuPG encryption is supported. | 5826 Currently only GnuPG encryption is supported, and integration |
5827 with gpg-agent is not yet implemented. | |
5824 | 5828 |
5825 \**NOTE WELL** that the encrypted text must be ascii-armored. For gnupg | 5829 \**NOTE WELL** that the encrypted text must be ascii-armored. For gnupg |
5826 encryption, include the option ``armor'' in your ~/.gnupg/gpg.conf file. | 5830 encryption, include the option ``armor'' in your ~/.gnupg/gpg.conf file. |
5827 | 5831 |
5828 See `allout-toggle-current-subtree-encryption' for more details." | 5832 See `allout-toggle-current-subtree-encryption' for more details." |
5994 (allout-get-configvar-values | 5998 (allout-get-configvar-values |
5995 'allout-encryption-ciphertext-rejection-regexps))) | 5999 'allout-encryption-ciphertext-rejection-regexps))) |
5996 (rejected (or rejected 0)) | 6000 (rejected (or rejected 0)) |
5997 (rejections-left (- allout-encryption-ciphertext-rejection-ceiling | 6001 (rejections-left (- allout-encryption-ciphertext-rejection-ceiling |
5998 rejected)) | 6002 rejected)) |
5999 result-text status) | 6003 result-text status |
6004 ;; Inhibit use of gpg-agent in the scope of this let: | |
6005 (pgg-gpg-use-agent nil)) | |
6000 | 6006 |
6001 (if (and fetch-pass (not passphrase)) | 6007 (if (and fetch-pass (not passphrase)) |
6002 ;; Force later fetch by evicting passphrase from the cache. | 6008 ;; Force later fetch by evicting passphrase from the cache. |
6003 (pgg-remove-passphrase-from-cache target-cache-id t)) | 6009 (pgg-remove-passphrase-from-cache target-cache-id t)) |
6004 | 6010 |