[Emacs-diffs] emacs/lisp ChangeLog pgg-gpg.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/06/18 17:47:51

Modified files:
        lisp           : ChangeLog pgg-gpg.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15691&r2=1.15692
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/pgg-gpg.el?cvsroot=emacs&r1=1.29&r2=1.30

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15691
retrieving revision 1.15692
diff -u -b -r1.15691 -r1.15692
--- ChangeLog   18 Jun 2009 06:54:47 -0000      1.15691
+++ ChangeLog   18 Jun 2009 17:47:48 -0000      1.15692
@@ -1,3 +1,8 @@
+2009-06-18  Ulrich Mueller  <address@hidden>
+
+       * pgg-gpg.el (pgg-gpg-lookup-key-owner): Handle colon listings
+       format used by GnuPG 2.0.a11.
+
 2009-06-18  Glenn Morris  <address@hidden>
 
        * files.el (dir-locals-set-directory-class): Make mtime argument

Index: pgg-gpg.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/pgg-gpg.el,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- pgg-gpg.el  5 Jan 2009 03:19:39 -0000       1.29
+++ pgg-gpg.el  18 Jun 2009 17:47:51 -0000      1.30
@@ -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))