-;;; 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, 2002, 2003, 2004,
+;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: mail
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, 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)
(if rmail-edit-map
nil
;; Make a keymap that inherits text-mode-map.
- (setq rmail-edit-map (nconc (make-sparse-keymap) text-mode-map))
+ (setq rmail-edit-map (make-sparse-keymap))
+ (set-keymap-parent rmail-edit-map text-mode-map)
(define-key rmail-edit-map "\C-c\C-c" 'rmail-cease-edit)
(define-key rmail-edit-map "\C-c\C-]" 'rmail-abort-edit))
"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}"
+ (delay-mode-hooks (text-mode))
(use-local-map rmail-edit-map)
(setq major-mode 'rmail-edit-mode)
(setq mode-name "RMAIL Edit")
(save-excursion
(set-buffer rmail-summary-buffer)
(rmail-summary-disable)))
- (run-hooks 'text-mode-hook 'rmail-edit-mode-hook))
+ (run-mode-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)))
- (put 'rmail-old-text 'permanent-local t)
(setq buffer-read-only nil)
- (set-buffer-modified-p (buffer-modified-p))
- ;; Make mode line update.
+ (force-mode-line-update)
(if (and (eq (key-binding "\C-c\C-c") 'rmail-cease-edit)
(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 (substitute-command-keys
- "Editing: Type \\[rmail-cease-edit] to return to Rmail, \\[rmail-abort-edit] to abort"))))
+ (message "%s" (substitute-command-keys
+ "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."
(set-marker (aref rmail-message-vector (1+ rmail-current-message))
(point)))
(let ((old rmail-old-text))
- ;; Update the mode line.
- (set-buffer-modified-p (buffer-modified-p))
+ (force-mode-line-update)
+ (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))))
()
(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 ()
(interactive)
(delete-region (point-min) (point-max))
(insert rmail-old-text)
- (rmail-cease-edit))
+ (rmail-cease-edit)
+ (rmail-highlight-headers))
+
+(provide 'rmailedit)
+;;; arch-tag: 93c22709-a14a-46c1-ab91-52c3f5a0ec12
;;; rmailedit.el ends here