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 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-27  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * mml2015.el (mml2015-epg-key-image): separate attribute stream from
+       stderr.
+
 2012-12-26  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * 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 (file)
--- 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))