Commit da42d41a authored by Gnus developers's avatar Gnus developers Committed by Katsumi Yamaoka
Browse files

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.
parent 78269b95
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.
* gnus-util.el (gnus-goto-colon): Move to the beginning of the visual
lines. This makes summary commands with hidden threads work more
reliably.
......
......@@ -1121,8 +1121,8 @@ parts. When nil, redisplay article."
(const :tag "Header" head)))
(defvar gnus-article-treat-types '("text/plain" "text/x-verbatim"
"text/x-patch")
"Parts to treat.")
"text/x-patch" "text/html")
"Part types eligible for treatment.")
(defvar gnus-inhibit-treatment nil
"Whether to inhibit treatment.")
......
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment