Bugfix: message.el (message-signed-or-encrypted-p): Exclude header when checking...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9c76635fb63f28c7087e1bbd1e2a1eea29f61b0e..a4c2d97403b3ab563f3079d84cd0c1d8516f4103 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * message.el (message-signed-or-encrypted-p): Exclude header when
+       checking if there is signed or encrypted body in text/plain message.
+
 2011-10-09  Andreas Schwab  <schwab@linux-m68k.org>
 
        * html2text.el (html2text-get-attr): Correctly handle attribute values

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 7203ef69a14d9b5069cc5fd2dacf137470668361..948892d1e13a49d5a4c64edb3856f1de9898f38b 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -7429,14 +7429,16 @@ is for the internal use."
       (with-temp-buffer
        (insert-buffer-substring cur)
        (when (setq handles (mm-dissect-buffer t t))
-         (if (and (prog1
-                      (bufferp (car handles))
-                    (mm-destroy-parts handles))
+         (if (and (bufferp (car handles))
                   (equal (mm-handle-media-type handles) "text/plain"))
              (progn
+               (erase-buffer)
+               (insert-buffer-substring (car handles))
                (mm-decode-content-transfer-encoding
                 (mm-handle-encoding handles))
+               (mm-destroy-parts handles)
                (setq handles (mm-uu-dissect)))
+           (mm-destroy-parts handles)
            (setq handles nil))))))
   (when handles
     (prog1