(shr-insert): Get white space at the beginning/end of elements right.

[gnus] / lisp / pgg-gpg.el

diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index 85a4e17..97b3b3e 100644 (file)
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -1,20 +1,21 @@
 ;;; 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: 
+;; Symmetric encryption and gpg-agent support added by:
 ;;   Sascha Wilde <wilde@sha-bang.de>
 ;; Created: 1999/10/28
 ;; Keywords: PGP, OpenPGP, GnuPG
+;; Package: pgg
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,9 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Code:
 
@@ -106,6 +105,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)
@@ -188,9 +190,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))
@@ -405,5 +407,4 @@ passphrase cache or user."
 
 (provide 'pgg-gpg)
 
-;;; arch-tag: 2aa5d5d8-93a0-4865-9312-33e29830e000
 ;;; pgg-gpg.el ends here