[gnus git] branch master updated: m0-5-230-gea60ea3 =1= Handle gpg errors better when trying to display PGP key image.

       via  ea60ea3c05a8391dcdc00251d1744e1558d7f7d4 (commit)
      from  70b44017dbc387e049883bf6c6ed41861218d089 (commit)


- Log -----------------------------------------------------------------
commit ea60ea3c05a8391dcdc00251d1744e1558d7f7d4
Author: Andreas Schwab <[email protected]>
Date:   Thu Dec 27 11:38:09 2012 +0100

    Handle gpg errors better when trying to display PGP key image.
    
    * mml2015.el (mml2015-epg-key-image): separate attribute stream from
    stderr.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eafb422..deda362 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-27  Andreas Schwab  <[email protected]>
+
+	* mml2015.el (mml2015-epg-key-image): separate attribute stream from
+	stderr.
+
 2012-12-26  Katsumi Yamaoka  <[email protected]>
 
 	* mml2015.el (mml2015-epg-key-image): Use mm-set-buffer-multibyte.
diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 0bc83ad..f8f0a56 100644
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -827,7 +827,7 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
     (let* ((coding-system-for-write 'binary)
            (coding-system-for-read 'binary)
            (data (shell-command-to-string
-                  (format "%s --list-options no-show-photos --attribute-fd 2 --list-keys %s > /dev/null"
+                  (format "%s --list-options no-show-photos --attribute-fd 3 --list-keys %s 3>&1 >/dev/null 2>&1"
                           epg-gpg-program key-id))))
       (when (> (length data) 0)
         (insert (substring data 16))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog  |    5 +++++
 lisp/mml2015.el |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project