diff options
| author | Gnus developers <ding@gnus.org> | 2012-12-26 22:30:58 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-12-26 22:30:58 +0000 |
| commit | da42d41a9011b9e866f22021185d26608300fe44 (patch) | |
| tree | 1c77957bd27cfd4760ba334af8b17ba2b5ab0a80 /lisp/gnus/mml2015.el | |
| parent | 78269b95cfe64d3ab5fabf1c2a63fa6abc7e0978 (diff) | |
| download | emacs-da42d41a9011b9e866f22021185d26608300fe44.tar.gz | |
Merge changes made in Gnus master
2012-12-26 Katsumi Yamaoka <yamaoka@jpl.org>
* mml2015.el (mml2015-epg-key-image): Use mm-set-buffer-multibyte.
2012-12-25 Adam Sjøgren <asjo@koldfront.dk>
* mml2015.el (mml2015-epg-key-image): use --attribute-fd rather than
temporary file to get PGP key image. Pass no-show-photos when extracting
image to avoid having it pop up twice.
2012-12-26 Lars Ingebrigtsen <larsi@gnus.org>
* gnus-art.el (gnus-article-treat-types): Include text/html as parts
eligible for treatment.
Diffstat (limited to 'lisp/gnus/mml2015.el')
| -rw-r--r-- | lisp/gnus/mml2015.el | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el index 847d1fa786f..0bc83ad4fb0 100644 --- a/lisp/gnus/mml2015.el +++ b/lisp/gnus/mml2015.el @@ -822,15 +822,16 @@ If set, it overrides the setting of `mml2015-sign-with-sender'." (defun mml2015-epg-key-image (key-id) "Return the image of a key, if any" - (let ((filename - (replace-regexp-in-string - "\n" "" - (shell-command-to-string - (format "%s --photo-viewer 'echo %%I >&2' --list-keys %s > /dev/null" - epg-gpg-program key-id))))) - (when (and (not (string-equal filename "")) - (file-exists-p filename)) - (create-image filename)))) + (with-temp-buffer + (mm-set-buffer-multibyte nil) + (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" + epg-gpg-program key-id)))) + (when (> (length data) 0) + (insert (substring data 16)) + (create-image (buffer-string) nil t))))) (defun mml2015-epg-key-image-to-string (key-id) "Return a string with the image of a key, if any" |