# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1245347268 0
# Node ID 25b1ef6821e27f15260b1608de3d13020a5a959b
# Parent  eced877f64ad5f4afc32d212dc0579ede83c62ca
* pgg-gpg.el (pgg-gpg-lookup-key-owner): Handle colon listings format
used by GnuPG 2.0.11.

diff -r eced877f64ad -r 25b1ef6821e2 lisp/ChangeLog
--- 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
diff -r eced877f64ad -r 25b1ef6821e2 lisp/pgg-gpg.el
--- 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))