Mercurial > hg > xemacs-beta
comparison lisp/vm/vm-reply.el @ 102:a145efe76779 r20-1b3
Import from CVS: tag r20-1b3
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:15:49 +0200 |
parents | 4be1180a9e89 |
children | 8619ce7e4c50 |
comparison
equal
deleted
inserted
replaced
101:a0ec055d74dd | 102:a145efe76779 |
---|---|
717 vm-resend-bounced-discard-header-regexp) | 717 vm-resend-bounced-discard-header-regexp) |
718 (if (search-forward "\n\n" nil t) | 718 (if (search-forward "\n\n" nil t) |
719 (replace-match "") | 719 (replace-match "") |
720 (goto-char (point-max))) | 720 (goto-char (point-max))) |
721 (insert ?\n mail-header-separator ?\n) | 721 (insert ?\n mail-header-separator ?\n) |
722 (mail-position-on-field "To") | 722 (goto-char (point-min)) |
723 (if vm-mail-header-from | |
724 (insert "Resent-From: " vm-mail-header-from ?\n)) | |
725 (mail-position-on-field "Resent-To") | |
723 (setq default-directory dir))) | 726 (setq default-directory dir))) |
724 (run-hooks 'vm-resend-bounced-message-hook) | 727 (run-hooks 'vm-resend-bounced-message-hook) |
725 (run-hooks 'vm-mail-mode-hook)) | 728 (run-hooks 'vm-mail-mode-hook)) |
726 | 729 |
727 (defun vm-resend-message () | 730 (defun vm-resend-message () |
823 (re-search-forward (concat "^" (regexp-quote mail-header-separator) | 826 (re-search-forward (concat "^" (regexp-quote mail-header-separator) |
824 "\n")) | 827 "\n")) |
825 (goto-char (match-end 0)) | 828 (goto-char (match-end 0)) |
826 (setq start (point-marker) | 829 (setq start (point-marker) |
827 header-end (match-beginning 0))) | 830 header-end (match-beginning 0))) |
828 (vm-unsaved-message "Building %s digest..." vm-digest-send-type) | 831 (message "Building %s digest..." vm-digest-send-type) |
829 (cond ((equal vm-digest-send-type "mime") | 832 (cond ((equal vm-digest-send-type "mime") |
830 (setq boundary (vm-mime-encapsulate-messages | 833 (setq boundary (vm-mime-encapsulate-messages |
831 mlist vm-mime-digest-headers | 834 mlist vm-mime-digest-headers |
832 vm-mime-digest-discard-header-regexp)) | 835 vm-mime-digest-discard-header-regexp)) |
833 (goto-char header-end) | 836 (goto-char header-end) |
851 vm-rfc1153-digest-discard-header-regexp))) | 854 vm-rfc1153-digest-discard-header-regexp))) |
852 (goto-char start) | 855 (goto-char start) |
853 (setq mp mlist) | 856 (setq mp mlist) |
854 (if prefix | 857 (if prefix |
855 (progn | 858 (progn |
856 (vm-unsaved-message "Building digest preamble...") | 859 (message "Building digest preamble...") |
857 (while mp | 860 (while mp |
858 (let ((vm-summary-uninteresting-senders nil)) | 861 (let ((vm-summary-uninteresting-senders nil)) |
859 (insert (vm-sprintf 'vm-digest-preamble-format (car mp)) "\n")) | 862 (insert (vm-sprintf 'vm-digest-preamble-format (car mp)) "\n")) |
860 (if vm-digest-center-preamble | 863 (if vm-digest-center-preamble |
861 (progn | 864 (progn |
969 (setq vm-mail-mode-map-parented t)))) | 972 (setq vm-mail-mode-map-parented t)))) |
970 (setq vm-mail-buffer folder-buffer | 973 (setq vm-mail-buffer folder-buffer |
971 mode-popup-menu (and vm-use-menus vm-popup-menu-on-mouse-3 | 974 mode-popup-menu (and vm-use-menus vm-popup-menu-on-mouse-3 |
972 (vm-menu-support-possible-p) | 975 (vm-menu-support-possible-p) |
973 (vm-menu-mode-menu))) | 976 (vm-menu-mode-menu))) |
974 ;; sets up popup menu for FSF Emacs | |
975 (and vm-use-menus (vm-menu-support-possible-p) | 977 (and vm-use-menus (vm-menu-support-possible-p) |
976 (vm-menu-install-mail-mode-menu)) | 978 (vm-menu-install-mail-mode-menu)) |
977 (if (fboundp 'mail-aliases-setup) ; use mail-abbrevs.el if present | 979 (if (fboundp 'mail-aliases-setup) ; use mail-abbrevs.el if present |
978 (mail-aliases-setup) | 980 (mail-aliases-setup) |
979 (if (eq mail-aliases t) | 981 (if (eq mail-aliases t) |