Merge handa-2001-3-27.

diff --git a/mail/rmail-mime.el b/mail/rmail-mime.el
index 53e8d33..6e59f70 100644 (file)
--- a/mail/rmail-mime.el
+++ b/mail/rmail-mime.el
@@ -49,6 +49,8 @@
   (let ((abuf (current-buffer))
        (buf-name (concat (buffer-name) "-view"))
        buf win)
+    (narrow-to-region (rmail-msgbeg rmail-current-message)
+                     (rmail-msgend rmail-current-message))
     (setq mime-message-structure
          (mime-open-entity 'babyl abuf))
     (set-buffer (mime-display-message mime-message-structure
@@ -167,7 +169,10 @@ If the search succeeds, return non-nil.  Otherwise, return nil."
 (eval-after-load "rmail"
   '(progn
      (define-key rmail-mode-map "v" 'rmail-enable-mime)
-     (setq rmail-show-mime-function (function rmail-show-mime-message))
+     (setq rmail-show-mime-function
+          (function rmail-show-mime-message)
+          rmail-insert-mime-forwarded-message-function
+          (function rmail-insert-mime-forwarded-message))
      (unless rmail-view-mode-map
        (setq rmail-view-mode-map (mime-view-define-keymap rmail-mode-map))
        (define-key rmail-view-mode-map

diff --git a/mime/mime-edit.el b/mime/mime-edit.el
index 37963cb..d091ef6 100644 (file)
--- a/mime/mime-edit.el
+++ b/mime/mime-edit.el
@@ -581,11 +581,9 @@ If it is not specified for a major-mode,
   :type 'regexp)
 
 (defvar mime-edit-split-message-sender-alist
-  '((mail-mode . (function
-                 (lambda ()
-                   (interactive)
-                   (funcall send-mail-function)
-                   )))))
+  '((mail-mode . (lambda ()
+                  (interactive)
+                  (funcall send-mail-function)))))
 
 (defvar mime-edit-news-reply-mode-server-running nil)