diff options
| author | Chong Yidong <[email protected]> | 2009-06-18 17:47:48 +0000 |
|---|---|---|
| committer | Chong Yidong <[email protected]> | 2009-06-18 17:47:48 +0000 |
| commit | f91e331380fd468cacc383c449c5711b3547c244 (patch) | |
| tree | 8878f9b3be33051519b8dda3faaed240418da680 | |
| parent | cf299835b1c4b4eba6c727ea47123af90f77bdf7 (diff) | |
* 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 b01a472419..1b55b59d4b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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.a11. + 2009-06-18 Glenn Morris <[email protected]> * files.el (dir-locals-set-directory-class): Make mtime argument diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el index 032b3d5d2d..b11b9284cd 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)) |