[Emacs-diffs] /srv/bzr/emacs/trunk r106047: Bugfix: message.el (message-signed-or-encrypted-p): Exclude header when checking if there is signed or encrypted body in text/plain message.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 106047
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2011-10-11 05:51:09 +0000
message:
  Bugfix: message.el (message-signed-or-encrypted-p): Exclude header when 
checking if there is signed or encrypted body in text/plain message.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/message.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-10-09 16:51:38 +0000
+++ b/lisp/gnus/ChangeLog       2011-10-11 05:51:09 +0000
@@ -1,3 +1,8 @@
+2011-10-11  Katsumi Yamaoka  <address@hidden>
+
+       * 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  <address@hidden>
 
        * html2text.el (html2text-get-attr): Correctly handle attribute values

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2011-09-21 22:34:54 +0000
+++ b/lisp/gnus/message.el      2011-10-11 05:51:09 +0000
@@ -7429,14 +7429,16 @@
       (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