Mercurial > emacs
changeset 103476:25b1ef6821e2
* pgg-gpg.el (pgg-gpg-lookup-key-owner): Handle colon listings format
used by GnuPG 2.0.11.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 18 Jun 2009 17:47:48 +0000 |
| parents | eced877f64ad |
| children | 6e845b9ff9bc |
| files | lisp/ChangeLog lisp/pgg-gpg.el |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Jun 18 10:29:51 2009 +0000 +++ b/lisp/ChangeLog Thu Jun 18 17:47:48 2009 +0000 @@ -1,3 +1,8 @@ +2009-06-18 Ulrich Mueller <ulm@gentoo.org> + + * pgg-gpg.el (pgg-gpg-lookup-key-owner): Handle colon listings + format used by GnuPG 2.0.a11. + 2009-06-18 Glenn Morris <rgm@gnu.org> * files.el (dir-locals-set-directory-class): Make mtime argument
--- a/lisp/pgg-gpg.el Thu Jun 18 10:29:51 2009 +0000 +++ b/lisp/pgg-gpg.el Thu Jun 18 17:47:48 2009 +0000 @@ -189,9 +189,9 @@ (let ((args (list "--with-colons" "--no-greeting" "--batch" (if all "--list-secret-keys" "--list-keys") string)) - (key-regexp (concat "^\\(sec\\|pub\\)" + (key-regexp (concat "^\\(sec\\|pub\\|uid\\)" ":[^:]*:[^:]*:[^:]*:\\([^:]*\\):[^:]*" - ":[^:]*:[^:]*:[^:]*:\\([^:]*\\):"))) + ":[^:]*:[^:]*:[^:]*:\\([^:]+\\):"))) (with-temp-buffer (apply #'call-process pgg-gpg-program nil t nil args) (goto-char (point-min))