Changes committed gnus/lisp (ChangeLog pgg-gpg.el)

Modified: ChangeLog pgg-gpg.el

Synch with Emacs trunk:
2009-06-18  Ulrich Mueller  <[email protected]>

	* pgg-gpg.el (pgg-gpg-lookup-key-owner): Handle colon listings
	format used by GnuPG 2.0.11.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1997 gnus/lisp/ChangeLog:7.1998
--- ChangeLog:7.1997	Mon Jun  1 13:48:30 2009
+++ ChangeLog	Fri Jun 19 02:33:26 2009
@@ -1,3 +1,8 @@
+2009-06-18  Ulrich Mueller  <[email protected]>
+
+	* pgg-gpg.el (pgg-gpg-lookup-key-owner): Handle colon listings
+	format used by GnuPG 2.0.11.
+
 2009-06-01  Katsumi Yamaoka  <[email protected]>
 
 	* gnus-art.el (gnus-mime-delete-part): Specify gnus-decoded as charset
Index: pgg-gpg.el
diff -u gnus/lisp/pgg-gpg.el:7.34 gnus/lisp/pgg-gpg.el:7.35
--- pgg-gpg.el:7.34	Thu Jan 22 08:02:16 2009
+++ pgg-gpg.el	Fri Jun 19 02:33:26 2009
@@ -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))