From: Simon Josefsson Date: Sat, 8 Oct 2005 08:43:33 +0000 (+0000) Subject: * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Fix PIN caching, X-Git-Tag: emacs-pretest-22.0.90~6747 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=82259e507db63f0da997b4df69b280d8d55c0f58;p=emacs.git * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Fix PIN caching, tiny patch from "Georg C. F. Greve" . --- diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 0d58f8046ee..91fab639f78 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2005-05-09 Simon Josefsson + + * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Fix PIN caching, + tiny patch from "Georg C. F. Greve" . + 2005-10-08 Simon Josefsson * pgg-def.el (top-level): Don't require custom, it is diff --git a/lisp/gnus/pgg-gpg.el b/lisp/gnus/pgg-gpg.el index f012a9d8506..6ba017c731c 100644 --- a/lisp/gnus/pgg-gpg.el +++ b/lisp/gnus/pgg-gpg.el @@ -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)))