Synch with Emacs trunk:

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.11.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e1985b..a5606c6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.11.
+
 2009-06-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-mime-delete-part): Specify gnus-decoded as charset

diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index 032b3d5..b11b928 100644 (file)
--- 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))