diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-06-18 17:47:48 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-06-18 17:47:48 +0000 |
| commit | 02140d68a597710da11d66556694235a86407c3e (patch) | |
| tree | 48a43edea1341cd1eee9ef22ef4de01550f9e14a | |
| parent | 786d34cf5ac86c6ac6f0230c3fb70728d016c044 (diff) | |
| download | emacs-02140d68a597710da11d66556694235a86407c3e.tar.gz | |
* pgg-gpg.el (pgg-gpg-lookup-key-owner): Handle colon listings format
used by GnuPG 2.0.11.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/pgg-gpg.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4feefb4fe42..6902972cca5 100644 --- 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.a11. + 2009-06-18 Glenn Morris <rgm@gnu.org> * 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)) |