comparison lisp/modes/sendmail.el @ 209:41ff10fd062f r20-4b3

Import from CVS: tag r20-4b3
author cvs
date Mon, 13 Aug 2007 10:04:58 +0200
parents a2f645c6b9f8
children
comparison
equal deleted inserted replaced
208:f427b8ec4379 209:41ff10fd062f
510 (defun mail-dont-send (arg) 510 (defun mail-dont-send (arg)
511 "Don't send the message you have been editing. 511 "Don't send the message you have been editing.
512 Prefix arg means don't delete this window." 512 Prefix arg means don't delete this window."
513 (interactive "P") 513 (interactive "P")
514 (mail-bury arg)) 514 (mail-bury arg))
515
516 (defvar rmail-summary-buffer)
515 517
516 (defun mail-bury (arg) 518 (defun mail-bury (arg)
517 "Bury this mail buffer." 519 "Bury this mail buffer."
518 (let ((newbuf (other-buffer (current-buffer)))) 520 (let ((newbuf (other-buffer (current-buffer))))
519 (bury-buffer (current-buffer)) 521 (bury-buffer (current-buffer))
857 (forward-word -1) ; skip back over zone 859 (forward-word -1) ; skip back over zone
858 (delete-region (point-min) (point)) ; nuke beginning to zone 860 (delete-region (point-min) (point)) ; nuke beginning to zone
859 (setq mail-do-fcc-cached-timezone 861 (setq mail-do-fcc-cached-timezone
860 (buffer-substring (point-min) (1- (point-max))))))))) 862 (buffer-substring (point-min) (1- (point-max)))))))))
861 863
862 (eval-when-compile 864 ;; Can't do this now that VM is unbundled.
863 (require 'vm-misc)) 865 ;; The lack of vm-misc is handled in mail-do-fcc-vm-internal.
866 ;;(eval-when-compile
867 ;; (require 'vm-misc))
868
869 (defvar rmail-total-messages)
864 870
865 (defun mail-do-fcc-rmail-internal (buffer) 871 (defun mail-do-fcc-rmail-internal (buffer)
866 (or (eq major-mode 'rmail-mode) (error "this only works in rmail-mode")) 872 (or (eq major-mode 'rmail-mode) (error "this only works in rmail-mode"))
867 (let ((b (point-min)) 873 (let ((b (point-min))
868 (e (point-max)) 874 (e (point-max))
898 (goto-char (point-min)) 904 (goto-char (point-min))
899 (skip-chars-forward "\n") 905 (skip-chars-forward "\n")
900 (forward-line) 906 (forward-line)
901 (delete-region (point-min) (point)))) 907 (delete-region (point-min) (point))))
902 908
903 ;; Largely copied from #'vm-save-message in vm-save.el 909 ;; Use eval to inhibit compilation of the following code.
904 (vm-save-restriction 910 ;; The code contains macros, and to compile them a (reuqire
905 (widen) 911 ;; 'vm-misc) is needed. When VM stopped being bundled with
906 (goto-char (point-max)) 912 ;; XEmacs, this require call became impossible.
907 (if foreign-folder-p 913 (eval
908 (vm-write-string (current-buffer) 914 (quote
909 (vm-leading-message-separator vm-folder-type))) 915 ;; Largely copied from #'vm-save-message in vm-save.el
910 (insert-buffer-substring buffer) 916 (vm-save-restriction
911 (if foreign-folder-p 917 (widen)
912 (vm-write-string (current-buffer) 918 (goto-char (point-max))
913 (vm-trailing-message-separator vm-folder-type))) 919 (if foreign-folder-p
914 920 (vm-write-string (current-buffer)
915 (vm-increment vm-messages-not-on-disk) 921 (vm-leading-message-separator vm-folder-type)))
916 (vm-set-buffer-modified-p t) 922 (insert-buffer-substring buffer)
917 (vm-clear-modification-flag-undos) 923 (if foreign-folder-p
918 (vm-check-for-killed-summary) 924 (vm-write-string (current-buffer)
919 (vm-assimilate-new-messages) 925 (vm-trailing-message-separator vm-folder-type)))
920 (vm-update-summary-and-mode-line)))) 926
927 (vm-increment vm-messages-not-on-disk)
928 (vm-set-buffer-modified-p t)
929 (vm-clear-modification-flag-undos)
930 (vm-check-for-killed-summary)
931 (vm-assimilate-new-messages)
932 (vm-update-summary-and-mode-line))))))
921 933
922 ;;(defun mail-sent-via () 934 ;;(defun mail-sent-via ()
923 ;; "Make a Sent-via header line from each To or CC header line." 935 ;; "Make a Sent-via header line from each To or CC header line."
924 ;; (interactive) 936 ;; (interactive)
925 ;; (save-excursion 937 ;; (save-excursion