Fix typos by Juanma Barranquero <lekktu@gmail.com>.

[gnus] / lisp / pgg-gpg.el

diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index 5aaad17..e8375fe 100644 (file)
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -1,7 +1,7 @@
 ;;; pgg-gpg.el --- GnuPG support for PGG.
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Symmetric encryption and gpg-agent support added by: 
@@ -104,6 +104,9 @@
          (process-send-eof process)
          (while (eq 'run (process-status process))
            (accept-process-output process 5))
+         ;; Accept any remaining pending output coming after the
+         ;; status change.
+         (accept-process-output process 5)
          (setq status (process-status process)
                exit-status (process-exit-status process))
          (delete-process process)
@@ -186,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))