diff options
Diffstat (limited to 'lisp/mail')
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 @@ (write-region (point-min) (point-max) "blessmail") (kill-emacs) -;;; arch-tag: c3329fe2-f945-41a9-8b00-b4b038ff182f ;;; 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]."))) (provide 'emacsbug) -;;; arch-tag: 248b6523-c3b5-4fec-9a3f-0411fafa7d49 ;;; 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." (provide 'feedmail) -;;; arch-tag: ec27b380-11c0-4dfd-8436-f636cf2bb992 ;;; 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 (provide 'footnote) -;;; arch-tag: 9bcfb6d7-2161-4caf-8793-700f62400398 ;;; 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.)" (provide 'mail-extr) -;;; arch-tag: 7785fade-1073-4ed6-b4f6-28db34a7982d ;;; 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." (provide 'mail-hist) -;;; arch-tag: 9ff9a07c-9dca-482d-ba87-54f42778559d ;;; 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." (provide 'mail-utils) -;;; arch-tag: b24aec2f-fd65-4ceb-9e39-3cc2827036fd ;;; 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.)") "The modification time of your mail alias file when it was last examined.") (defun mail-abbrevs-sync-aliases () - (when mail-personal-alias-file - (if (file-exists-p mail-personal-alias-file) - (let ((modtime (nth 5 (file-attributes mail-personal-alias-file)))) - (if (not (equal mail-abbrev-modtime modtime)) - (progn - (setq mail-abbrev-modtime modtime) - (build-mail-abbrevs))))))) + (if (file-exists-p mail-personal-alias-file) + (let ((modtime (nth 5 (file-attributes mail-personal-alias-file)))) + (if (not (equal mail-abbrev-modtime modtime)) + (progn + (setq mail-abbrev-modtime modtime) + (build-mail-abbrevs)))))) ;;;###autoload (defun mail-abbrevs-setup () @@ -626,5 +625,4 @@ Don't use this command in Lisp programs! (if mail-abbrevs-mode (mail-abbrevs-enable)) -;;; arch-tag: 5aa2d901-73f8-4ad7-b73c-4802282ad2ff ;;; 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'." (provide 'mailalias) -;;; arch-tag: 1d6a0f87-eb34-4d45-8816-60c1b952cf46 ;;; 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." (provide 'mailheader) -;;; arch-tag: 6e7aa221-80b5-4b3d-b46f-fd66ab567be0 ;;; 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." (provide 'mailpost) -;;; arch-tag: 1f8ca085-60a6-4eac-8efb-69ffec2fa124 ;;; 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 @@ ;; Copyright (C) 1993, 1996 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp> -;; Version: $Id: metamail.el,v 1.15 2003/02/04 13:14:00 lektu Exp $ +;; Version: $Id: metamail.el,v 1.14 2000/11/12 00:22:02 fx Exp $ ;; Keywords: mail, news, mime, multimedia ;; This file is part of GNU Emacs. @@ -190,5 +190,4 @@ redisplayed as output is inserted." (provide 'metamail) -;;; arch-tag: 52c0cb6f-d800-4776-9789-f0275cb5490e ;;; 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." (provide 'mspools) -;;; arch-tag: 8990b3ee-68c8-4892-98f1-51a735c8bac6 ;;; 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." (provide 'reporter) - -;;; arch-tag: 33612ff4-fbbc-4be2-b183-560ce9e0199b ;;; 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." (provide 'rfc2368) -;;; arch-tag: ea804934-ad96-4f69-957b-857a76e4fd95 ;;; 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 @@ (provide 'rfc822) -;;; arch-tag: 5d388a24-e173-40fb-9b8e-85269de44b37 ;;; 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' (provide 'rmail-spam-filter) -;;; arch-tag: 03e1d45d-b72f-4dd7-8f04-e7fd78249746 ;;; 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." (save-excursion (skip-chars-forward " \t\n") (point))) - (save-excursion - (let* ((header-end - (progn - (save-excursion - (goto-char start) - (forward-line 1) - (if (looking-at "0") - (forward-line 1) - (forward-line 2)) - (save-restriction - (narrow-to-region (point) (point-max)) - (rfc822-goto-eoh) - (point))))) - (case-fold-search t) - (quoted-printable-header-field-end - (save-excursion - (goto-char start) - (re-search-forward - "^content-transfer-encoding:\\(\n?[\t ]\\)*quoted-printable\\(\n?[\t ]\\)*" - header-end t))) - (base64-header-field-end - (save-excursion - (goto-char start) - (re-search-forward - "^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*" - header-end t)))) - (if quoted-printable-header-field-end - (save-excursion - (rmail-decode-quoted-printable header-end (point)) - ;; Change "quoted-printable" to "8bit", - ;; to reflect the decoding we just did. - (goto-char quoted-printable-header-field-end) - (delete-region (point) (search-backward ":")) - (insert ": 8bit"))) - (if base64-header-field-end - (save-excursion - (base64-decode-region (1+ header-end) - (- (point) 2)) - ;; Change "base64" to "8bit", to reflect the - ;; decoding we just did. - (goto-char (1+ header-end)) - (while (search-forward "\r\n" (point-max) t) - (replace-match "\n")) - (goto-char base64-header-field-end) - (delete-region (point) (search-backward ":")) - (insert ": 8bit"))) - (setq last-coding-system-used nil) - (or rmail-enable-mime - (not rmail-enable-multibyte) - (let ((mime-charset - (if (and rmail-decode-mime-charset - (save-excursion - (goto-char start) - (search-forward "\n\n" nil t) - (let ((case-fold-search t)) - (re-search-backward - rmail-mime-charset-pattern - start t)))) - (intern (downcase (match-string 1)))))) - (rmail-decode-region start (point) mime-charset))))) + (setq last-coding-system-used nil) + (or rmail-enable-mime + (not rmail-enable-multibyte) + (decode-coding-region start (point) + (or rmail-file-coding-system + 'undecided))) ;; Add an X-Coding-System: header if we don't have one. (save-excursion (goto-char start) @@ -1768,11 +1714,6 @@ It returns t if it got any new messages." (re-search-forward "^content-transfer-encoding:\\(\n?[\t ]\\)*quoted-printable\\(\n?[\t ]\\)*" header-end t))) - (base64-header-field-end - (save-excursion - (re-search-forward - "^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*" - header-end t))) (size ;; Get the numeric value from the Content-Length field. (save-excursion @@ -1821,14 +1762,6 @@ It returns t if it got any new messages." ;; to reflect the decoding we just did. (goto-char quoted-printable-header-field-end) (delete-region (point) (search-backward ":")) - (insert ": 8bit"))) - (if base64-header-field-end - (save-excursion - (base64-decode-region header-end (point)) - ;; Change "base64" to "8bit", to reflect the - ;; decoding we just did. - (goto-char base64-header-field-end) - (delete-region (point) (search-backward ":")) (insert ": 8bit")))) (save-excursion @@ -3822,5 +3755,4 @@ encoded string (and the same mask) will decode the string." (provide 'rmail) -;;; arch-tag: cff0a950-57fe-4f73-a86e-91ff75afd06c ;;; 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'. (provide 'rmailedit) -;;; arch-tag: 93c22709-a14a-46c1-ab91-52c3f5a0ec12 ;;; 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." (- (buffer-size) omax))))) keyword)) -;;; arch-tag: b26b3392-99ca-4e1d-933a-dab59b04e9a8 ;;; 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." (setq rmail-inbox-list (rmail-parse-file-inboxes)) (rmail-show-message rmail-current-message)) -;;; arch-tag: 74ed1d50-2c25-4cbd-b5ae-d29ed8aba6e4 ;;; 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." (if rmail-delete-after-output (rmail-delete-forward))) -;;; arch-tag: 447117c6-1a9a-4b88-aa43-3101b043e3a4 ;;; 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." (provide 'rmailsort) -;;; arch-tag: 0d90896b-0c35-46ac-b240-38be5ada2360 ;;; 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." (provide 'rmailsum) -;;; arch-tag: 556079ee-75c1-47f5-9884-2e0a0bc6c5a1 ;;; 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'." (defcustom mail-specify-envelope-from nil "*If non-nil, specify the envelope-from address when sending mail. The value used to specify it is whatever is found in -the variable `mail-envelope-from', with `user-mail-address' as fallback. +`mail-envelope-from', with `user-mail-address' as fallback. On most systems, specifying the envelope-from address is a -privileged operation. This variable affects sendmail and -smtpmail -- if you use feedmail to send mail, see instead the -variable `feedmail-deduce-envelope-from'." +privileged operation. This variable is only used if +`send-mail-function' is set to `sendmail-send-it'." :version "21.1" :type 'boolean :group 'sendmail) @@ -387,11 +386,10 @@ actually occur.") (defun sendmail-sync-aliases () - (when mail-personal-alias-file - (let ((modtime (nth 5 (file-attributes mail-personal-alias-file)))) - (or (equal mail-alias-modtime modtime) - (setq mail-alias-modtime modtime - mail-aliases t))))) + (let ((modtime (nth 5 (file-attributes mail-personal-alias-file)))) + (or (equal mail-alias-modtime modtime) + (setq mail-alias-modtime modtime + mail-aliases t)))) (defun mail-setup (to subject in-reply-to cc replybuffer actions) (or mail-default-reply-to @@ -400,9 +398,8 @@ actually occur.") (if (eq mail-aliases t) (progn (setq mail-aliases nil) - (when mail-personal-alias-file - (if (file-exists-p mail-personal-alias-file) - (build-mail-aliases))))) + (if (file-exists-p mail-personal-alias-file) + (build-mail-aliases)))) ;; Don't leave this around from a previous message. (kill-local-variable 'buffer-file-coding-system) ;; 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." (provide 'sendmail) -;;; arch-tag: 48bc1025-d993-4d31-8d81-2a29491f0626 ;;; 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'.") ;;; (defvar smtpmail-mail-address nil - "Value to use for envelope-from address for mail from ambient buffer.") + "Value of `user-mail-address' in ambient buffer.") ;;;###autoload (defun smtpmail-send-it () @@ -223,11 +223,7 @@ This is relative to `smtpmail-queue-dir'.") (case-fold-search nil) delimline (mailbuf (current-buffer)) - ;; Examine this variable now, so that - ;; local binding in the mail buffer will take effect. - (smtpmail-mail-address - (or (and mail-specify-envelope-from (mail-envelope-from)) - user-mail-address)) + (smtpmail-mail-address user-mail-address) (smtpmail-code-conv-from (if enable-multibyte-characters (let ((sendmail-coding-system smtpmail-code-conv-from)) @@ -403,14 +399,11 @@ This is relative to `smtpmail-queue-dir'.") (with-temp-buffer (let ((coding-system-for-read 'no-conversion)) (insert-file-contents file-msg)) - (let ((smtpmail-mail-address - (or (and mail-specify-envelope-from (mail-envelope-from)) - user-mail-address))) - (if (not (null smtpmail-recipient-address-list)) - (if (not (smtpmail-via-smtp smtpmail-recipient-address-list - (current-buffer))) - (error "Sending failed; SMTP protocol error")) - (error "Sending failed; no recipients")))) + (if (not (null smtpmail-recipient-address-list)) + (if (not (smtpmail-via-smtp smtpmail-recipient-address-list + (current-buffer))) + (error "Sending failed; SMTP protocol error")) + (error "Sending failed; no recipients"))) (delete-file file-msg) (delete-file (concat file-msg ".el")) (delete-region (point-at-bol) (point-at-bol 2))) @@ -552,12 +545,9 @@ This is relative to `smtpmail-queue-dir'.") (host (or smtpmail-smtp-server (error "`smtpmail-smtp-server' not defined"))) (port smtpmail-smtp-service) - ;; smtpmail-mail-address should be set to the appropriate - ;; buffer-local value by the caller, but in case not: - (envelope-from (or smtpmail-mail-address - (and mail-specify-envelope-from - (mail-envelope-from)) - user-mail-address)) + (envelope-from (or (mail-envelope-from) + smtpmail-mail-address + user-mail-address)) response-code greeting process-buffer @@ -707,7 +697,7 @@ This is relative to `smtpmail-queue-dir'.") ""))) ; (smtpmail-send-command process (format "MAIL FROM:%s@%s" (user-login-name) (smtpmail-fqdn))) (smtpmail-send-command process (format "MAIL FROM: <%s>%s%s" - envelope-from + envelope-from size-part body-part)) @@ -960,5 +950,4 @@ many continuation lines." (provide 'smtpmail) -;;; arch-tag: a76992df-6d71-43b7-9e72-4bacc6c05466 ;;; 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'." (provide 'supercite) (run-hooks 'sc-load-hook) -;;; arch-tag: a5d5bfa6-3bd5-4414-8c65-0afc83e45cd3 ;;; 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." (provide 'uce) -;;; arch-tag: 44b68c87-9b29-47bd-822c-3feee3883221 ;;; 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." (provide 'undigest) -;;; arch-tag: 3a28b9fb-c1f5-43ef-9278-285f3e4b874d ;;; 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'." ;;; unrmail.el ends here -;;; 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." (provide 'vms-pmail) -;;; arch-tag: 336850fc-7812-4663-8e4d-b9c13f47dce1 ;;; vms-pmail.el ends here |