From f91e331380fd468cacc383c449c5711b3547c244 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 18 Jun 2009 17:47:48 +0000 Subject: [PATCH] * pgg-gpg.el (pgg-gpg-lookup-key-owner): Handle colon listings format used by GnuPG 2.0.11. --- lisp/ChangeLog | 5 +++++ lisp/pgg-gpg.el | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b01a4724192..1b55b59d4b8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-06-18 Ulrich Mueller + + * pgg-gpg.el (pgg-gpg-lookup-key-owner): Handle colon listings + format used by GnuPG 2.0.a11. + 2009-06-18 Glenn Morris * files.el (dir-locals-set-directory-class): Make mtime argument diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el index 032b3d5d2da..b11b9284cd4 100644 --- a/lisp/pgg-gpg.el +++ b/lisp/pgg-gpg.el @@ -189,9 +189,9 @@ Optional ALL non-nil means search all keys, including secret keys." (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)) -- 2.11.4.GIT