summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org>2012-12-26 22:30:58 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2012-12-26 22:30:58 +0000
commitda42d41a9011b9e866f22021185d26608300fe44 (patch)
tree1c77957bd27cfd4760ba334af8b17ba2b5ab0a80
parent78269b95cfe64d3ab5fabf1c2a63fa6abc7e0978 (diff)
downloademacs-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.
-rw-r--r--lisp/gnus/ChangeLog13
-rw-r--r--lisp/gnus/gnus-art.el4
-rw-r--r--lisp/gnus/mml2015.el19
3 files changed, 25 insertions, 11 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c873c6f6704..d95c9cdee30 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,18 @@
+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.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 53e3d67161f..ba186d50555 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -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.")
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"