(spam-summary-prepare-exit): use spam-process-ham-in-spam-groups

[gnus] / lisp / gnus-fun.el

diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el
index f906dec..ca5cdea 100644 (file)
--- a/lisp/gnus-fun.el
+++ b/lisp/gnus-fun.el
@@ -111,10 +111,11 @@ Output to the current buffer, replace text, and don't mingle error."
       (while (and (not done)
                  (> quant 1))
        (setq attempt
-             (gnus-shell-command-to-string
-              (format gnus-convert-image-to-face-command
-                      (shell-quote-argument (expand-file-name file))
-                      quant)))
+             (let ((coding-system-for-read 'binary))
+               (gnus-shell-command-to-string
+                (format gnus-convert-image-to-face-command
+                        (shell-quote-argument (expand-file-name file))
+                        quant))))
        (if (> (length attempt) 726)
            (progn
              (setq quant (- quant 2))
@@ -189,9 +190,9 @@ colors of the displayed X-Faces."
            (if (gnus-image-type-available-p 'xface)
                (gnus-create-image
                 (concat "X-Face: " data)
-                'xface t :ascent 'center :face 'gnus-x-face)
+                'xface t :face 'gnus-x-face)
              (gnus-create-image
-              pbm 'pbm t :ascent 'center :face 'gnus-x-face))))
+              pbm 'pbm t :face 'gnus-x-face)) nil 'xface))
          (gnus-add-wash-type 'xface))))))
 
 (defun gnus-grab-cam-x-face ()