[Emacs-diffs] /srv/bzr/emacs/trunk r104992: Fix rmail mime search bug when entity is a string.

[Richard Stallman]

------------------------------------------------------------
revno: 104992
committer: Richard Stallman <address@hidden>
branch nick: trunk
timestamp: Wed 2011-07-06 12:48:37 -0400
message:
  Fix rmail mime search bug when entity is a string.
modified:
  lisp/ChangeLog
  lisp/mail/rmailmm.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-06 16:46:27 +0000
+++ b/lisp/ChangeLog    2011-07-06 16:48:37 +0000
@@ -8,6 +8,9 @@
        (rmail-mime-toggle-hidden): Likewise, for showing.
        (rmail-mime-process-multipart): Record when an entity is truncated.
 
+       * mail/rmailmm.el (rmail-search-mime-message): Don't get confused
+       if ENTITY is a string.
+
 2011-07-06  Lars Magne Ingebrigtsen  <address@hidden>
 
        * emacs-lisp/lisp-mode.el (eval-defun-1): Update the documentation

=== modified file 'lisp/mail/rmailmm.el'
--- a/lisp/mail/rmailmm.el      2011-07-06 16:44:33 +0000
+++ b/lisp/mail/rmailmm.el      2011-07-06 16:48:37 +0000
@@ -1408,6 +1408,8 @@
         (re-search-forward regexp nil t))
        ;; Next, search the body.
        (if (and entity
+               ;; RMS: I am not sure why, but sometimes this is a string.
+               (not (stringp entity))
                (let* ((content-type (rmail-mime-entity-type entity))
                       (charset (cdr (assq 'charset (cdr content-type)))))
                  (or (not (string-match "text/.*" (car content-type)))