Fix rmail mime search bug when entity is a string.

This commit is contained in:
Richard M. Stallman 2011-07-06 12:48:37 -04:00
parent f4f7319875
commit a9a936b988
2 changed files with 5 additions and 0 deletions

View file

@ -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 <larsi@gnus.org>
* emacs-lisp/lisp-mode.el (eval-defun-1): Update the documentation

View file

@ -1408,6 +1408,8 @@ This is the usual value of `rmail-insert-mime-forwarded-message-function'."
(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)))