aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/mail/sendmail.el4
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ffc894747bd..fe15ce23a1c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,7 @@
3 * mail/sendmail.el (mail-interactive): Doc fix. 3 * mail/sendmail.el (mail-interactive): Doc fix.
4 (mail-yank-ignored-headers): Add X-RMAIL- headers, bump :version. 4 (mail-yank-ignored-headers): Add X-RMAIL- headers, bump :version.
5 (mail-setup): Use the function mail-signature. 5 (mail-setup): Use the function mail-signature.
6 (mail-mode-hook): Doc fix.
6 (mail-to, mail-subject, mail-cc, mail-bcc, mail-reply-to) 7 (mail-to, mail-subject, mail-cc, mail-bcc, mail-reply-to)
7 (mail-mail-reply-to, mail-mail-followup-to): Doc fixes. 8 (mail-mail-reply-to, mail-mail-followup-to): Doc fixes.
8 (mail-signature): Check the signature file is readable. 9 (mail-signature): Check the signature file is readable.
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 7245a35f8f1..bbf42e16b1b 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -614,7 +614,9 @@ actually occur.")
614 (run-hooks 'mail-setup-hook)) 614 (run-hooks 'mail-setup-hook))
615 615
616(defcustom mail-mode-hook nil 616(defcustom mail-mode-hook nil
617 "Hook run by Mail mode." 617 "Hook run by Mail mode.
618When composing a mail, this runs immediately after creating, or
619switching to, the `*mail*' buffer. See also `mail-setup-hook'."
618 :group 'sendmail 620 :group 'sendmail
619 :type 'hook 621 :type 'hook
620 :options '(footnote-mode)) 622 :options '(footnote-mode))