diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2012-12-27 14:44:01 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-12-27 14:44:01 +0000 |
| commit | 541aff54ba8caf9c3fff1d2039cce29e44a7a7f0 (patch) | |
| tree | 953e78fc5c07325e3db1787140f671e1b1926e18 /lisp | |
| parent | c396a95363d567f88052968284e8b2b348bae0f0 (diff) | |
| download | emacs-541aff54ba8caf9c3fff1d2039cce29e44a7a7f0.tar.gz emacs-541aff54ba8caf9c3fff1d2039cce29e44a7a7f0.tar.bz2 emacs-541aff54ba8caf9c3fff1d2039cce29e44a7a7f0.zip | |
lisp/gnus/mml2015.el (mml2015-epg-key-image): separate attribute stream from stderr
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/gnus/mml2015.el | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index a830088f3b6..9968c82faeb 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -5,6 +5,9 @@ 2012-12-27 Andreas Schwab <schwab@linux-m68k.org> + * mml2015.el (mml2015-epg-key-image): separate attribute stream from + stderr. + * nnimap.el (nnimap-find-article-by-message-id): Don't error out if group is nil. diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el index 0bc83ad4fb0..f8f0a560417 100644 --- a/lisp/gnus/mml2015.el +++ b/lisp/gnus/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)) |