aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/mail
diff options
context:
space:
mode:
authorKenichi Handa2003-09-08 11:56:09 +0000
committerKenichi Handa2003-09-08 11:56:09 +0000
commit463f5630a5e7cbe7f042bc1175d1fa1c4e98860f (patch)
tree3287d0c628fea2249abf4635b3a4f45bedd6f8c4 /lisp/mail
parent4256310de631bd57c78b88b5131caa073315b3d7 (diff)
downloademacs-463f5630a5e7cbe7f042bc1175d1fa1c4e98860f.tar.gz
emacs-463f5630a5e7cbe7f042bc1175d1fa1c4e98860f.zip
New directory
Diffstat (limited to 'lisp/mail')
-rw-r--r--lisp/mail/blessmail.el1
-rw-r--r--lisp/mail/emacsbug.el1
-rw-r--r--lisp/mail/feedmail.el1
-rw-r--r--lisp/mail/footnote.el1
-rw-r--r--lisp/mail/mail-extr.el1
-rw-r--r--lisp/mail/mail-hist.el1
-rw-r--r--lisp/mail/mail-utils.el1
-rw-r--r--lisp/mail/mailabbrev.el14
-rw-r--r--lisp/mail/mailalias.el1
-rw-r--r--lisp/mail/mailheader.el1
-rw-r--r--lisp/mail/mailpost.el1
-rw-r--r--lisp/mail/metamail.el3
-rw-r--r--lisp/mail/mspools.el1
-rw-r--r--lisp/mail/reporter.el2
-rw-r--r--lisp/mail/rfc2368.el1
-rw-r--r--lisp/mail/rfc822.el1
-rw-r--r--lisp/mail/rmail-spam-filter.el1
-rw-r--r--lisp/mail/rmail.el80
-rw-r--r--lisp/mail/rmailedit.el1
-rw-r--r--lisp/mail/rmailkwd.el1
-rw-r--r--lisp/mail/rmailmsc.el1
-rw-r--r--lisp/mail/rmailout.el1
-rw-r--r--lisp/mail/rmailsort.el1
-rw-r--r--lisp/mail/rmailsum.el1
-rw-r--r--lisp/mail/sendmail.el22
-rw-r--r--lisp/mail/smtpmail.el33
-rw-r--r--lisp/mail/supercite.el1
-rw-r--r--lisp/mail/uce.el1
-rw-r--r--lisp/mail/undigest.el1
-rw-r--r--lisp/mail/unrmail.el1
-rw-r--r--lisp/mail/vms-pmail.el1
31 files changed, 33 insertions, 146 deletions
diff --git a/lisp/mail/blessmail.el b/lisp/mail/blessmail.el
index 70438811dcf..d87f1f3232d 100644
--- a/lisp/mail/blessmail.el
+++ b/lisp/mail/blessmail.el
@@ -66,5 +66,4 @@
66(write-region (point-min) (point-max) "blessmail") 66(write-region (point-min) (point-max) "blessmail")
67(kill-emacs) 67(kill-emacs)
68 68
69;;; arch-tag: c3329fe2-f945-41a9-8b00-b4b038ff182f
70;;; blessmail.el ends here 69;;; blessmail.el ends here
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 59521ebf678..c86c1827261 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -255,5 +255,4 @@ and send the mail again using \\[mail-send-and-exit].")))
255 255
256(provide 'emacsbug) 256(provide 'emacsbug)
257 257
258;;; arch-tag: 248b6523-c3b5-4fec-9a3f-0411fafa7d49
259;;; emacsbug.el ends here 258;;; emacsbug.el ends here
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 3d1b1951421..735bcd36353 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -2670,5 +2670,4 @@ been weeded out."
2670 2670
2671(provide 'feedmail) 2671(provide 'feedmail)
2672 2672
2673;;; arch-tag: ec27b380-11c0-4dfd-8436-f636cf2bb992
2674;;; feedmail.el ends here 2673;;; feedmail.el ends here
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el
index 4644d36ad25..b4e8d20c4ef 100644
--- a/lisp/mail/footnote.el
+++ b/lisp/mail/footnote.el
@@ -752,5 +752,4 @@ key binding
752 752
753(provide 'footnote) 753(provide 'footnote)
754 754
755;;; arch-tag: 9bcfb6d7-2161-4caf-8793-700f62400398
756;;; footnote.el ends here 755;;; footnote.el ends here
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index 1995933382f..8bcc4c72d3a 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -2144,5 +2144,4 @@ consing a string.)"
2144 2144
2145(provide 'mail-extr) 2145(provide 'mail-extr)
2146 2146
2147;;; arch-tag: 7785fade-1073-4ed6-b4f6-28db34a7982d
2148;;; mail-extr.el ends here 2147;;; mail-extr.el ends here
diff --git a/lisp/mail/mail-hist.el b/lisp/mail/mail-hist.el
index ba66ca079fe..da27b726efa 100644
--- a/lisp/mail/mail-hist.el
+++ b/lisp/mail/mail-hist.el
@@ -293,5 +293,4 @@ received mail."
293 293
294(provide 'mail-hist) 294(provide 'mail-hist)
295 295
296;;; arch-tag: 9ff9a07c-9dca-482d-ba87-54f42778559d
297;;; mail-hist.el ends here 296;;; mail-hist.el ends here
diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index 628b937529c..42be6b57040 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -346,5 +346,4 @@ If 4th arg LIST is non-nil, return a list of all such fields."
346 346
347(provide 'mail-utils) 347(provide 'mail-utils)
348 348
349;;; arch-tag: b24aec2f-fd65-4ceb-9e39-3cc2827036fd
350;;; mail-utils.el ends here 349;;; mail-utils.el ends here
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index c67d8062afd..b2edf777861 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -161,13 +161,12 @@ no aliases, which is represented by this being a table with no entries.)")
161 "The modification time of your mail alias file when it was last examined.") 161 "The modification time of your mail alias file when it was last examined.")
162 162
163(defun mail-abbrevs-sync-aliases () 163(defun mail-abbrevs-sync-aliases ()
164 (when mail-personal-alias-file 164 (if (file-exists-p mail-personal-alias-file)
165 (if (file-exists-p mail-personal-alias-file) 165 (let ((modtime (nth 5 (file-attributes mail-personal-alias-file))))
166 (let ((modtime (nth 5 (file-attributes mail-personal-alias-file)))) 166 (if (not (equal mail-abbrev-modtime modtime))
167 (if (not (equal mail-abbrev-modtime modtime)) 167 (progn
168 (progn 168 (setq mail-abbrev-modtime modtime)
169 (setq mail-abbrev-modtime modtime) 169 (build-mail-abbrevs))))))
170 (build-mail-abbrevs)))))))
171 170
172;;;###autoload 171;;;###autoload
173(defun mail-abbrevs-setup () 172(defun mail-abbrevs-setup ()
@@ -626,5 +625,4 @@ Don't use this command in Lisp programs!
626(if mail-abbrevs-mode 625(if mail-abbrevs-mode
627 (mail-abbrevs-enable)) 626 (mail-abbrevs-enable))
628 627
629;;; arch-tag: 5aa2d901-73f8-4ad7-b73c-4802282ad2ff
630;;; mailabbrev.el ends here 628;;; mailabbrev.el ends here
diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index 18f52e6434f..6d0c2e12125 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -540,5 +540,4 @@ See `mail-directory-stream'."
540 540
541(provide 'mailalias) 541(provide 'mailalias)
542 542
543;;; arch-tag: 1d6a0f87-eb34-4d45-8816-60c1b952cf46
544;;; mailalias.el ends here 543;;; mailalias.el ends here
diff --git a/lisp/mail/mailheader.el b/lisp/mail/mailheader.el
index 1eac0dfa3a3..163b2ecd5ec 100644
--- a/lisp/mail/mailheader.el
+++ b/lisp/mail/mailheader.el
@@ -191,5 +191,4 @@ A key of nil has as its value a list of defaulted headers to ignore."
191 191
192(provide 'mailheader) 192(provide 'mailheader)
193 193
194;;; arch-tag: 6e7aa221-80b5-4b3d-b46f-fd66ab567be0
195;;; mailheader.el ends here 194;;; mailheader.el ends here
diff --git a/lisp/mail/mailpost.el b/lisp/mail/mailpost.el
index 8d57de6ede7..f8198c9e97d 100644
--- a/lisp/mail/mailpost.el
+++ b/lisp/mail/mailpost.el
@@ -105,5 +105,4 @@ site-init."
105 105
106(provide 'mailpost) 106(provide 'mailpost)
107 107
108;;; arch-tag: 1f8ca085-60a6-4eac-8efb-69ffec2fa124
109;;; mailpost.el ends here 108;;; mailpost.el ends here
diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el
index d64616dba8e..7cfc4312a79 100644
--- a/lisp/mail/metamail.el
+++ b/lisp/mail/metamail.el
@@ -3,7 +3,7 @@
3;; Copyright (C) 1993, 1996 Free Software Foundation, Inc. 3;; Copyright (C) 1993, 1996 Free Software Foundation, Inc.
4 4
5;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp> 5;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
6;; Version: $Id: metamail.el,v 1.15 2003/02/04 13:14:00 lektu Exp $ 6;; Version: $Id: metamail.el,v 1.14 2000/11/12 00:22:02 fx Exp $
7;; Keywords: mail, news, mime, multimedia 7;; Keywords: mail, news, mime, multimedia
8 8
9;; This file is part of GNU Emacs. 9;; This file is part of GNU Emacs.
@@ -190,5 +190,4 @@ redisplayed as output is inserted."
190 190
191(provide 'metamail) 191(provide 'metamail)
192 192
193;;; arch-tag: 52c0cb6f-d800-4776-9789-f0275cb5490e
194;;; metamail.el ends here 193;;; metamail.el ends here
diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el
index 8dc165dcc5e..1f8651727ec 100644
--- a/lisp/mail/mspools.el
+++ b/lisp/mail/mspools.el
@@ -404,5 +404,4 @@ nil."
404 404
405(provide 'mspools) 405(provide 'mspools)
406 406
407;;; arch-tag: 8990b3ee-68c8-4892-98f1-51a735c8bac6
408;;; mspools.el ends here 407;;; mspools.el ends here
diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index 6e609a1f365..c1d5839babd 100644
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -407,6 +407,4 @@ mail-sending package is used for editing and sending the message."
407 407
408 408
409(provide 'reporter) 409(provide 'reporter)
410
411;;; arch-tag: 33612ff4-fbbc-4be2-b183-560ce9e0199b
412;;; reporter.el ends here 410;;; reporter.el ends here
diff --git a/lisp/mail/rfc2368.el b/lisp/mail/rfc2368.el
index 4bfeb911063..25456523657 100644
--- a/lisp/mail/rfc2368.el
+++ b/lisp/mail/rfc2368.el
@@ -162,5 +162,4 @@ calling this function."
162 162
163(provide 'rfc2368) 163(provide 'rfc2368)
164 164
165;;; arch-tag: ea804934-ad96-4f69-957b-857a76e4fd95
166;;; rfc2368.el ends here 165;;; rfc2368.el ends here
diff --git a/lisp/mail/rfc822.el b/lisp/mail/rfc822.el
index 9b3d5c18d4c..989f43cd5a5 100644
--- a/lisp/mail/rfc822.el
+++ b/lisp/mail/rfc822.el
@@ -316,5 +316,4 @@
316 316
317(provide 'rfc822) 317(provide 'rfc822)
318 318
319;;; arch-tag: 5d388a24-e173-40fb-9b8e-85269de44b37
320;;; rfc822.el ends here 319;;; rfc822.el ends here
diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el
index c0ccf7f4289..0ae87fe5179 100644
--- a/lisp/mail/rmail-spam-filter.el
+++ b/lisp/mail/rmail-spam-filter.el
@@ -629,5 +629,4 @@ prevents this. Also, don't create entries for messages in the `rmail-spam-file'
629 629
630(provide 'rmail-spam-filter) 630(provide 'rmail-spam-filter)
631 631
632;;; arch-tag: 03e1d45d-b72f-4dd7-8f04-e7fd78249746
633;;; rmail-spam-filter ends here 632;;; rmail-spam-filter ends here
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index ae3fbbd7e3f..deb043ffba9 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1652,66 +1652,12 @@ It returns t if it got any new messages."
1652 (save-excursion 1652 (save-excursion
1653 (skip-chars-forward " \t\n") 1653 (skip-chars-forward " \t\n")
1654 (point))) 1654 (point)))
1655 (save-excursion 1655 (setq last-coding-system-used nil)
1656 (let* ((header-end 1656 (or rmail-enable-mime
1657 (progn 1657 (not rmail-enable-multibyte)
1658 (save-excursion 1658 (decode-coding-region start (point)
1659 (goto-char start) 1659 (or rmail-file-coding-system
1660 (forward-line 1) 1660 'undecided)))
1661 (if (looking-at "0")
1662 (forward-line 1)
1663 (forward-line 2))
1664 (save-restriction
1665 (narrow-to-region (point) (point-max))
1666 (rfc822-goto-eoh)
1667 (point)))))
1668 (case-fold-search t)
1669 (quoted-printable-header-field-end
1670 (save-excursion
1671 (goto-char start)
1672 (re-search-forward
1673 "^content-transfer-encoding:\\(\n?[\t ]\\)*quoted-printable\\(\n?[\t ]\\)*"
1674 header-end t)))
1675 (base64-header-field-end
1676 (save-excursion
1677 (goto-char start)
1678 (re-search-forward
1679 "^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*"
1680 header-end t))))
1681 (if quoted-printable-header-field-end
1682 (save-excursion
1683 (rmail-decode-quoted-printable header-end (point))
1684 ;; Change "quoted-printable" to "8bit",
1685 ;; to reflect the decoding we just did.
1686 (goto-char quoted-printable-header-field-end)
1687 (delete-region (point) (search-backward ":"))
1688 (insert ": 8bit")))
1689 (if base64-header-field-end
1690 (save-excursion
1691 (base64-decode-region (1+ header-end)
1692 (- (point) 2))
1693 ;; Change "base64" to "8bit", to reflect the
1694 ;; decoding we just did.
1695 (goto-char (1+ header-end))
1696 (while (search-forward "\r\n" (point-max) t)
1697 (replace-match "\n"))
1698 (goto-char base64-header-field-end)
1699 (delete-region (point) (search-backward ":"))
1700 (insert ": 8bit")))
1701 (setq last-coding-system-used nil)
1702 (or rmail-enable-mime
1703 (not rmail-enable-multibyte)
1704 (let ((mime-charset
1705 (if (and rmail-decode-mime-charset
1706 (save-excursion
1707 (goto-char start)
1708 (search-forward "\n\n" nil t)
1709 (let ((case-fold-search t))
1710 (re-search-backward
1711 rmail-mime-charset-pattern
1712 start t))))
1713 (intern (downcase (match-string 1))))))
1714 (rmail-decode-region start (point) mime-charset)))))
1715 ;; Add an X-Coding-System: header if we don't have one. 1661 ;; Add an X-Coding-System: header if we don't have one.
1716 (save-excursion 1662 (save-excursion
1717 (goto-char start) 1663 (goto-char start)
@@ -1768,11 +1714,6 @@ It returns t if it got any new messages."
1768 (re-search-forward 1714 (re-search-forward
1769 "^content-transfer-encoding:\\(\n?[\t ]\\)*quoted-printable\\(\n?[\t ]\\)*" 1715 "^content-transfer-encoding:\\(\n?[\t ]\\)*quoted-printable\\(\n?[\t ]\\)*"
1770 header-end t))) 1716 header-end t)))
1771 (base64-header-field-end
1772 (save-excursion
1773 (re-search-forward
1774 "^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*"
1775 header-end t)))
1776 (size 1717 (size
1777 ;; Get the numeric value from the Content-Length field. 1718 ;; Get the numeric value from the Content-Length field.
1778 (save-excursion 1719 (save-excursion
@@ -1821,14 +1762,6 @@ It returns t if it got any new messages."
1821 ;; to reflect the decoding we just did. 1762 ;; to reflect the decoding we just did.
1822 (goto-char quoted-printable-header-field-end) 1763 (goto-char quoted-printable-header-field-end)
1823 (delete-region (point) (search-backward ":")) 1764 (delete-region (point) (search-backward ":"))
1824 (insert ": 8bit")))
1825 (if base64-header-field-end
1826 (save-excursion
1827 (base64-decode-region header-end (point))
1828 ;; Change "base64" to "8bit", to reflect the
1829 ;; decoding we just did.
1830 (goto-char base64-header-field-end)
1831 (delete-region (point) (search-backward ":"))
1832 (insert ": 8bit")))) 1765 (insert ": 8bit"))))
1833 1766
1834 (save-excursion 1767 (save-excursion
@@ -3822,5 +3755,4 @@ encoded string (and the same mask) will decode the string."
3822 3755
3823(provide 'rmail) 3756(provide 'rmail)
3824 3757
3825;;; arch-tag: cff0a950-57fe-4f73-a86e-91ff75afd06c
3826;;; rmail.el ends here 3758;;; rmail.el ends here
diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index a057c019b82..3835070b341 100644
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -156,5 +156,4 @@ This functions runs the normal hook `rmail-edit-mode-hook'.
156 156
157(provide 'rmailedit) 157(provide 'rmailedit)
158 158
159;;; arch-tag: 93c22709-a14a-46c1-ab91-52c3f5a0ec12
160;;; rmailedit.el ends here 159;;; rmailedit.el ends here
diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index 6772817637f..693fbc68428 100644
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -271,5 +271,4 @@ With prefix argument N moves forward N messages with these labels."
271 (- (buffer-size) omax))))) 271 (- (buffer-size) omax)))))
272 keyword)) 272 keyword))
273 273
274;;; arch-tag: b26b3392-99ca-4e1d-933a-dab59b04e9a8
275;;; rmailkwd.el ends here 274;;; rmailkwd.el ends here
diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el
index ea0a9d0cf80..7a0871f1414 100644
--- a/lisp/mail/rmailmsc.el
+++ b/lisp/mail/rmailmsc.el
@@ -58,5 +58,4 @@ If FILE-NAME is empty, remove any existing inbox list."
58 (setq rmail-inbox-list (rmail-parse-file-inboxes)) 58 (setq rmail-inbox-list (rmail-parse-file-inboxes))
59 (rmail-show-message rmail-current-message)) 59 (rmail-show-message rmail-current-message))
60 60
61;;; arch-tag: 74ed1d50-2c25-4cbd-b5ae-d29ed8aba6e4
62;;; rmailmsc.el ends here 61;;; rmailmsc.el ends here
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index 0dd23d71d33..e23f73a9db2 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -413,5 +413,4 @@ FILE-NAME defaults, interactively, from the Subject field of the message."
413 (if rmail-delete-after-output 413 (if rmail-delete-after-output
414 (rmail-delete-forward))) 414 (rmail-delete-forward)))
415 415
416;;; arch-tag: 447117c6-1a9a-4b88-aa43-3101b043e3a4
417;;; rmailout.el ends here 416;;; rmailout.el ends here
diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el
index 3194358451c..c4e95c80541 100644
--- a/lisp/mail/rmailsort.el
+++ b/lisp/mail/rmailsort.el
@@ -246,5 +246,4 @@ Arguments are MSG and FIELD."
246 246
247(provide 'rmailsort) 247(provide 'rmailsort)
248 248
249;;; arch-tag: 0d90896b-0c35-46ac-b240-38be5ada2360
250;;; rmailsort.el ends here 249;;; rmailsort.el ends here
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 3affdf88bb5..cb14d6a7c44 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -1650,5 +1650,4 @@ KEYWORDS is a comma-separated list of labels."
1650 1650
1651(provide 'rmailsum) 1651(provide 'rmailsum)
1652 1652
1653;;; arch-tag: 556079ee-75c1-47f5-9884-2e0a0bc6c5a1
1654;;; rmailsum.el ends here 1653;;; rmailsum.el ends here
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index d7c00148ba3..fa6fd8952ff 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -68,12 +68,11 @@ controlled by a separate variable, `mail-specify-envelope-from'."
68(defcustom mail-specify-envelope-from nil 68(defcustom mail-specify-envelope-from nil
69 "*If non-nil, specify the envelope-from address when sending mail. 69 "*If non-nil, specify the envelope-from address when sending mail.
70The value used to specify it is whatever is found in 70The value used to specify it is whatever is found in
71the variable `mail-envelope-from', with `user-mail-address' as fallback. 71`mail-envelope-from', with `user-mail-address' as fallback.
72 72
73On most systems, specifying the envelope-from address is a 73On most systems, specifying the envelope-from address is a
74privileged operation. This variable affects sendmail and 74privileged operation. This variable is only used if
75smtpmail -- if you use feedmail to send mail, see instead the 75`send-mail-function' is set to `sendmail-send-it'."
76variable `feedmail-deduce-envelope-from'."
77 :version "21.1" 76 :version "21.1"
78 :type 'boolean 77 :type 'boolean
79 :group 'sendmail) 78 :group 'sendmail)
@@ -387,11 +386,10 @@ actually occur.")
387 386
388 387
389(defun sendmail-sync-aliases () 388(defun sendmail-sync-aliases ()
390 (when mail-personal-alias-file 389 (let ((modtime (nth 5 (file-attributes mail-personal-alias-file))))
391 (let ((modtime (nth 5 (file-attributes mail-personal-alias-file)))) 390 (or (equal mail-alias-modtime modtime)
392 (or (equal mail-alias-modtime modtime) 391 (setq mail-alias-modtime modtime
393 (setq mail-alias-modtime modtime 392 mail-aliases t))))
394 mail-aliases t)))))
395 393
396(defun mail-setup (to subject in-reply-to cc replybuffer actions) 394(defun mail-setup (to subject in-reply-to cc replybuffer actions)
397 (or mail-default-reply-to 395 (or mail-default-reply-to
@@ -400,9 +398,8 @@ actually occur.")
400 (if (eq mail-aliases t) 398 (if (eq mail-aliases t)
401 (progn 399 (progn
402 (setq mail-aliases nil) 400 (setq mail-aliases nil)
403 (when mail-personal-alias-file 401 (if (file-exists-p mail-personal-alias-file)
404 (if (file-exists-p mail-personal-alias-file) 402 (build-mail-aliases))))
405 (build-mail-aliases)))))
406 ;; Don't leave this around from a previous message. 403 ;; Don't leave this around from a previous message.
407 (kill-local-variable 'buffer-file-coding-system) 404 (kill-local-variable 'buffer-file-coding-system)
408 ;; This doesn't work for enable-multibyte-characters. 405 ;; This doesn't work for enable-multibyte-characters.
@@ -1727,5 +1724,4 @@ you can move to one of them and type C-c C-c to recover that one."
1727 1724
1728(provide 'sendmail) 1725(provide 'sendmail)
1729 1726
1730;;; arch-tag: 48bc1025-d993-4d31-8d81-2a29491f0626
1731;;; sendmail.el ends here 1727;;; sendmail.el ends here
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 35c01201b3c..e24f20b8691 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -212,7 +212,7 @@ This is relative to `smtpmail-queue-dir'.")
212;;; 212;;;
213 213
214(defvar smtpmail-mail-address nil 214(defvar smtpmail-mail-address nil
215 "Value to use for envelope-from address for mail from ambient buffer.") 215 "Value of `user-mail-address' in ambient buffer.")
216 216
217;;;###autoload 217;;;###autoload
218(defun smtpmail-send-it () 218(defun smtpmail-send-it ()
@@ -223,11 +223,7 @@ This is relative to `smtpmail-queue-dir'.")
223 (case-fold-search nil) 223 (case-fold-search nil)
224 delimline 224 delimline
225 (mailbuf (current-buffer)) 225 (mailbuf (current-buffer))
226 ;; Examine this variable now, so that 226 (smtpmail-mail-address user-mail-address)
227 ;; local binding in the mail buffer will take effect.
228 (smtpmail-mail-address
229 (or (and mail-specify-envelope-from (mail-envelope-from))
230 user-mail-address))
231 (smtpmail-code-conv-from 227 (smtpmail-code-conv-from
232 (if enable-multibyte-characters 228 (if enable-multibyte-characters
233 (let ((sendmail-coding-system smtpmail-code-conv-from)) 229 (let ((sendmail-coding-system smtpmail-code-conv-from))
@@ -403,14 +399,11 @@ This is relative to `smtpmail-queue-dir'.")
403 (with-temp-buffer 399 (with-temp-buffer
404 (let ((coding-system-for-read 'no-conversion)) 400 (let ((coding-system-for-read 'no-conversion))
405 (insert-file-contents file-msg)) 401 (insert-file-contents file-msg))
406 (let ((smtpmail-mail-address 402 (if (not (null smtpmail-recipient-address-list))
407 (or (and mail-specify-envelope-from (mail-envelope-from)) 403 (if (not (smtpmail-via-smtp smtpmail-recipient-address-list
408 user-mail-address))) 404 (current-buffer)))
409 (if (not (null smtpmail-recipient-address-list)) 405 (error "Sending failed; SMTP protocol error"))
410 (if (not (smtpmail-via-smtp smtpmail-recipient-address-list 406 (error "Sending failed; no recipients")))
411 (current-buffer)))
412 (error "Sending failed; SMTP protocol error"))
413 (error "Sending failed; no recipients"))))
414 (delete-file file-msg) 407 (delete-file file-msg)
415 (delete-file (concat file-msg ".el")) 408 (delete-file (concat file-msg ".el"))
416 (delete-region (point-at-bol) (point-at-bol 2))) 409 (delete-region (point-at-bol) (point-at-bol 2)))
@@ -552,12 +545,9 @@ This is relative to `smtpmail-queue-dir'.")
552 (host (or smtpmail-smtp-server 545 (host (or smtpmail-smtp-server
553 (error "`smtpmail-smtp-server' not defined"))) 546 (error "`smtpmail-smtp-server' not defined")))
554 (port smtpmail-smtp-service) 547 (port smtpmail-smtp-service)
555 ;; smtpmail-mail-address should be set to the appropriate 548 (envelope-from (or (mail-envelope-from)
556 ;; buffer-local value by the caller, but in case not: 549 smtpmail-mail-address
557 (envelope-from (or smtpmail-mail-address 550 user-mail-address))
558 (and mail-specify-envelope-from
559 (mail-envelope-from))
560 user-mail-address))
561 response-code 551 response-code
562 greeting 552 greeting
563 process-buffer 553 process-buffer
@@ -707,7 +697,7 @@ This is relative to `smtpmail-queue-dir'.")
707 ""))) 697 "")))
708; (smtpmail-send-command process (format "MAIL FROM:%s@%s" (user-login-name) (smtpmail-fqdn))) 698; (smtpmail-send-command process (format "MAIL FROM:%s@%s" (user-login-name) (smtpmail-fqdn)))
709 (smtpmail-send-command process (format "MAIL FROM: <%s>%s%s" 699 (smtpmail-send-command process (format "MAIL FROM: <%s>%s%s"
710 envelope-from 700 envelope-from
711 size-part 701 size-part
712 body-part)) 702 body-part))
713 703
@@ -960,5 +950,4 @@ many continuation lines."
960 950
961(provide 'smtpmail) 951(provide 'smtpmail)
962 952
963;;; arch-tag: a76992df-6d71-43b7-9e72-4bacc6c05466
964;;; smtpmail.el ends here 953;;; smtpmail.el ends here
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index 40c43af5823..558b9f9e388 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -2045,5 +2045,4 @@ more information. Info node `(SC)Top'."
2045(provide 'supercite) 2045(provide 'supercite)
2046(run-hooks 'sc-load-hook) 2046(run-hooks 'sc-load-hook)
2047 2047
2048;;; arch-tag: a5d5bfa6-3bd5-4414-8c65-0afc83e45cd3
2049;;; supercite.el ends here 2048;;; supercite.el ends here
diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el
index 08f76359abb..93b3e430e7a 100644
--- a/lisp/mail/uce.el
+++ b/lisp/mail/uce.el
@@ -392,5 +392,4 @@ address, and postmaster of the mail relay used."
392 392
393(provide 'uce) 393(provide 'uce)
394 394
395;;; arch-tag: 44b68c87-9b29-47bd-822c-3feee3883221
396;;; uce.el ends here 395;;; uce.el ends here
diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index 2c447065643..1890353c33b 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -307,5 +307,4 @@ following the containing message."
307 307
308(provide 'undigest) 308(provide 'undigest)
309 309
310;;; arch-tag: 3a28b9fb-c1f5-43ef-9278-285f3e4b874d
311;;; undigest.el ends here 310;;; undigest.el ends here
diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index 55f611b53ad..f0e4bbf38bb 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -173,4 +173,3 @@ For example, invoke `emacs -batch -f batch-unrmail RMAIL'."
173 173
174;;; unrmail.el ends here 174;;; unrmail.el ends here
175 175
176;;; arch-tag: 14c6290d-60b2-456f-8909-5c2387de6acb
diff --git a/lisp/mail/vms-pmail.el b/lisp/mail/vms-pmail.el
index 675d9112c7b..7fe7771d350 100644
--- a/lisp/mail/vms-pmail.el
+++ b/lisp/mail/vms-pmail.el
@@ -119,5 +119,4 @@ If neither file exists, fails quietly."
119 119
120(provide 'vms-pmail) 120(provide 'vms-pmail)
121 121
122;;; arch-tag: 336850fc-7812-4663-8e4d-b9c13f47dce1
123;;; vms-pmail.el ends here 122;;; vms-pmail.el ends here