Merge from emacs-23; up to 2010-06-02T00:10:42Z!yamaoka@jpl.org.

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

diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 4aa3e81132f25f20bc438dff4b7203966e4856f8..96132739b201696758e86d3d61cfb6a456da36d2 100644 (file)
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -1,11 +1,12 @@
 ;;; rmailmm.el --- MIME decoding and display stuff for RMAIL
 
-;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+;; Copyright (C) 2006-2011  Free Software Foundation, Inc.
 
 ;; Author: Alexander Pohoyda
 ;;     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:
 
@@ -326,7 +327,7 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where
     (aset new 2 (aref (rmail-mime-entity-body entity) 2)))
   (dolist (child (rmail-mime-entity-children entity))
     (rmail-mime-shown-mode child)))
-  
+
 (defun rmail-mime-hidden-mode (entity)
   "Make MIME-entity ENTITY displayed in the hidden mode."
   (let ((new (aref (rmail-mime-entity-display entity) 1)))
@@ -423,7 +424,7 @@ to the tag line."
          (insert item)
        (apply 'insert-button item))))
   (insert "]\n"))
-  
+
 (defun rmail-mime-update-tagline (entity)
   "Update the current tag line for MIME-entity ENTITY."
   (let ((inhibit-read-only t)
@@ -1148,7 +1149,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))
@@ -1364,7 +1365,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)
@@ -1375,7 +1376,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.
@@ -1395,5 +1396,4 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'."
 ;; generated-autoload-file: "rmail.el"
 ;; End:
 
-;; arch-tag: 3f2c5e5d-1aef-4512-bc20-fd737c9d5dd9
 ;;; rmailmm.el ends here