Mercurial > emacs
changeset 65921:03ce3b2e47a2
* pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Fix PIN caching,
tiny patch from "Georg C. F. Greve" <greve@gnu.org>.
| author | Simon Josefsson <jas@extundo.com> |
|---|---|
| date | Sat, 08 Oct 2005 08:43:33 +0000 |
| parents | 194850eac491 |
| children | ce1cf38cd09f |
| files | lisp/gnus/ChangeLog lisp/gnus/pgg-gpg.el |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Sat Oct 08 08:40:34 2005 +0000 +++ b/lisp/gnus/ChangeLog Sat Oct 08 08:43:33 2005 +0000 @@ -1,3 +1,8 @@ +2005-05-09 Simon Josefsson <jas@extundo.com> + + * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Fix PIN caching, + tiny patch from "Georg C. F. Greve" <greve@gnu.org>. + 2005-10-08 Simon Josefsson <jas@extundo.com> * pgg-def.el (top-level): Don't require custom, it is
--- a/lisp/gnus/pgg-gpg.el Sat Oct 08 08:40:34 2005 +0000 +++ b/lisp/gnus/pgg-gpg.el Sat Oct 08 08:43:33 2005 +0000 @@ -100,13 +100,13 @@ (if (and pgg-cache-passphrase (progn (goto-char (point-min)) - (re-search-forward "^\\[GNUPG:] GOOD_PASSPHRASE\\>" nil t))) + (re-search-forward "^\\[GNUPG:] \\(GOOD_PASSPHRASE\\>\\)\\|\\(SIG_CREATED\\)" nil t))) (pgg-add-passphrase-cache (or key (progn (goto-char (point-min)) (if (re-search-forward - "^\\[GNUPG:] NEED_PASSPHRASE \\w+ ?\\w*" nil t) + "^\\[GNUPG:] NEED_PASSPHRASE\\(_PIN\\)? \\w+ ?\\w*" nil t) (substring (match-string 0) -8)))) passphrase)))