Upgraded to MH-E version 7.1.

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

diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index b83411ce5ae03342b5a16cbacff74c7c04a30f8e..3835070b341c4f77565becd55e02322b4012c75e 100644 (file)
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -1,6 +1,6 @@
-;;; rmailedit.el --- "RMAIL edit mode"  Edit the current message.
+;;; rmailedit.el --- "RMAIL edit mode"  Edit the current message
 
-;; Copyright (C) 1985, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1994, 2001 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
@@ -22,10 +22,18 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 (require 'rmail)
 
+(defcustom rmail-edit-mode-hook nil
+  "List of functions to call when editing an RMAIL message."
+  :type 'hook
+  :version "21.1"
+  :group 'rmail-edit)
+
 (defvar rmail-old-text)
 
 (defvar rmail-edit-map nil)
@@ -44,9 +52,10 @@
   "Major mode for editing the contents of an RMAIL message.
 The editing commands are the same as in Text mode, together with two commands
 to return to regular RMAIL:
-  *  rmail-abort-edit cancels the changes
+  *  \\[rmail-abort-edit] cancels the changes
      you have made and returns to RMAIL
-  *  rmail-cease-edit makes them permanent.
+  *  \\[rmail-cease-edit] makes them permanent.
+This functions runs the normal hook `rmail-edit-mode-hook'.
 \\{rmail-edit-map}"
   (text-mode)
   (use-local-map rmail-edit-map)
@@ -61,11 +70,26 @@ to return to regular RMAIL:
        (rmail-summary-disable)))
   (run-hooks 'rmail-edit-mode-hook))
 
+(defvar rmail-old-pruned nil)
+(put 'rmail-old-pruned 'permanent-local t)
+
+(defvar rmail-edit-saved-coding-system nil)
+(put 'rmail-edit-saved-coding-system 'permanent-local t)
+
 ;;;###autoload
 (defun rmail-edit-current-message ()
   "Edit the contents of this message."
   (interactive)
+  (make-local-variable 'rmail-old-pruned)
+  (setq rmail-old-pruned (rmail-msg-is-pruned))
+  (make-local-variable 'rmail-edit-saved-coding-system)
+  (setq rmail-edit-saved-coding-system save-buffer-coding-system)
+  (rmail-toggle-header 0)
   (rmail-edit-mode)
+  ;; As the local value of save-buffer-coding-system is deleted by
+  ;; rmail-edit-mode, we restore the original value.
+  (make-local-variable 'save-buffer-coding-system)
+  (setq save-buffer-coding-system rmail-edit-saved-coding-system)
   (make-local-variable 'rmail-old-text)
   (setq rmail-old-text (buffer-substring (point-min) (point-max)))
   (setq buffer-read-only nil)
@@ -74,7 +98,7 @@ to return to regular RMAIL:
           (eq (key-binding "\C-c\C-]") 'rmail-abort-edit))
       (message "Editing: Type C-c C-c to return to Rmail, C-c C-] to abort")
     (message "%s" (substitute-command-keys
-              "Editing: Type \\[rmail-cease-edit] to return to Rmail, \\[rmail-abort-edit] to abort"))))
+                  "Editing: Type \\[rmail-cease-edit] to return to Rmail, \\[rmail-abort-edit] to abort"))))
 
 (defun rmail-cease-edit ()
   "Finish editing message; switch back to Rmail proper."
@@ -96,6 +120,9 @@ to return to regular RMAIL:
     (kill-all-local-variables)
     (rmail-mode-1)
     (rmail-variables)
+    ;; As the local value of save-buffer-coding-system is changed by
+    ;; rmail-variables, we restore the original value.
+    (setq save-buffer-coding-system rmail-edit-saved-coding-system)
     (if (and (= (length old) (- (point-max) (point-min)))
             (string= old (buffer-substring (point-min) (point-max))))
        ()
@@ -106,14 +133,17 @@ to return to regular RMAIL:
            (aset rmail-summary-vector (1- rmail-current-message) nil)
            (save-excursion
              (rmail-widen-to-current-msgbeg
-               (function (lambda ()
+               (function (lambda ()
                            (forward-line 2)
                            (if (looking-at "Summary-line: ")
                                (let ((buffer-read-only nil))
                                  (delete-region (point)
                                                 (progn (forward-line 1)
-                                                       (point))))))))
-             (rmail-show-message))))))
+                                                       (point))))))))))))
+    (save-excursion
+      (rmail-show-message)
+      (rmail-toggle-header (if rmail-old-pruned 1 0))))
+  (run-hooks 'rmail-mode-hook)
   (setq buffer-read-only t))
 
 (defun rmail-abort-edit ()
@@ -124,4 +154,6 @@ to return to regular RMAIL:
   (rmail-cease-edit)
   (rmail-highlight-headers))
 
+(provide 'rmailedit)
+
 ;;; rmailedit.el ends here