Merge from emacs-23

[gnu-emacs] / lisp / mail / rmailmm.el

diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index f6741023e64b187281ec8ea4c51c9db12de044d8..ba1f39798e3352d72efba2c26857cb4126c4fdb2 100644 (file)
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -6,6 +6,7 @@
 ;;     Alex Schroeder
 ;; Maintainer: FSF
 ;; Keywords: mail
+;; Package: rmail
 
 ;; This file is part of GNU Emacs.
 
@@ -52,7 +53,7 @@
 ;;
 ;; rmail-mime
 ;;  +- rmail-mime-show <----------------------------------+
-;;       +- rmail-mime-process                            | 
+;;       +- rmail-mime-process                            |
 ;;            +- rmail-mime-handle                        |
 ;;                 +- rmail-mime-text-handler             |
 ;;                 +- rmail-mime-bulk-handler             |
@@ -159,7 +160,7 @@ A MIME-entity is a vector of 9 elements:
 
   [TYPE DISPOSITION TRANSFER-ENCODING DISPLAY HEADER TAGLINE BODY
    CHILDREN HANDLER]
-  
+
 TYPE and DISPOSITION correspond to MIME headers Content-Type and
 Cotent-Disposition respectively, and has this format:
 
@@ -320,7 +321,7 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where
 
 (defun rmail-mime-next-item ()
   "Move point to the next displayed item of the current MIME entity.
-A MIME entity has three items; header, tagline, and body. 
+A MIME entity has three items; header, tagline, and body.
 If we are in the last item of the entity, move point to the first
 item of the next entity.  If we reach the end of buffer, move
 point to the first item of the first entity (i.e. the beginning
@@ -360,7 +361,7 @@ entity."
     (aset new 0 (aref (rmail-mime-entity-header entity) 2))
     (aset new 1 (aref (rmail-mime-entity-tagline entity) 2))
     (aset new 2 (aref (rmail-mime-entity-body entity) 2))))
-  
+
 (defun rmail-mime-hidden-mode (entity top)
   "Make MIME-entity ENTITY displayed in the hidden mode.
 If TOP is non-nil, display ENTITY only by the tagline.
@@ -460,7 +461,7 @@ to the tag line."
          (insert item)
        (apply 'insert-button item))))
   (insert "]\n"))
-  
+
 (defun rmail-mime-insert-header (header)
   "Decode and insert a MIME-entity header HEADER in the current buffer.
 HEADER is a vector [BEG END DEFAULT-STATUS].
@@ -1114,7 +1115,7 @@ modified."
 
       ;; Hide headers and handle the part.
       (put-text-property (point-min) (point-max) 'rmail-mime-entity
-                        (rmail-mime-entity 
+                        (rmail-mime-entity
                         content-type content-disposition
                         content-transfer-encoding
                         (vector (vector 'raw nil 'raw) (vector 'raw nil 'raw))
@@ -1308,7 +1309,7 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'."
                         (re-search-forward "^$" nil 'move) (point)))
           (body-end (point-max))
           (entity (rmail-mime-parse)))
-      (or 
+      (or
        ;; At first, just search the headers.
        (with-temp-buffer
         (insert-buffer-substring rmail-mime-mbox-buffer nil header-end)
@@ -1319,7 +1320,7 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'."
        (if (and entity
                (let* ((content-type (rmail-mime-entity-type entity))
                       (charset (cdr (assq 'charset (cdr content-type)))))
-                 (or (not (string-match "text/.*" (car content-type))) 
+                 (or (not (string-match "text/.*" (car content-type)))
                      (and charset
                           (not (string= (downcase charset) "us-ascii"))))))
           ;; Search the decoded MIME message.