aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/mail/sendmail.el8
2 files changed, 7 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 01a47fd4aaf..87d7cf03eb2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12011-03-03 Glenn Morris <rgm@gnu.org> 12011-03-03 Glenn Morris <rgm@gnu.org>
2 2
3 * mail/sendmail.el (mail-mode-map): Remove mail-sent-via.
4 (mail-mode): Remove mail-sent-via from the doc.
5 (mail-sent-via): Make it obsolete. (Bug#1776)
6
3 * progmodes/grep.el (grep-highlight-matches): Doc fix. 7 * progmodes/grep.el (grep-highlight-matches): Doc fix.
4 (grep-process-setup): No highlighting without font-lock. (Bug#8084) 8 (grep-process-setup): No highlighting without font-lock. (Bug#8084)
5 9
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 77ae87b5449..0548f24b1dd 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -309,7 +309,6 @@ The default value matches citations like `foo-bar>' plus whitespace."
309 (define-key map [remap split-line] 'mail-split-line) 309 (define-key map [remap split-line] 'mail-split-line)
310 (define-key map "\C-c\C-q" 'mail-fill-yanked-message) 310 (define-key map "\C-c\C-q" 'mail-fill-yanked-message)
311 (define-key map "\C-c\C-w" 'mail-signature) 311 (define-key map "\C-c\C-w" 'mail-signature)
312 (define-key map "\C-c\C-v" 'mail-sent-via)
313 (define-key map "\C-c\C-c" 'mail-send-and-exit) 312 (define-key map "\C-c\C-c" 'mail-send-and-exit)
314 (define-key map "\C-c\C-s" 'mail-send) 313 (define-key map "\C-c\C-s" 'mail-send)
315 (define-key map "\C-c\C-i" 'mail-attach-file) 314 (define-key map "\C-c\C-i" 'mail-attach-file)
@@ -349,9 +348,6 @@ The default value matches citations like `foo-bar>' plus whitespace."
349 (define-key map [menu-bar headers expand-aliases] 348 (define-key map [menu-bar headers expand-aliases]
350 '("Expand Aliases" . expand-mail-aliases)) 349 '("Expand Aliases" . expand-mail-aliases))
351 350
352 (define-key map [menu-bar headers sent-via]
353 '("Sent-Via" . mail-sent-via))
354
355 (define-key map [menu-bar headers mail-reply-to] 351 (define-key map [menu-bar headers mail-reply-to]
356 '("Mail-Reply-To" . mail-mail-reply-to)) 352 '("Mail-Reply-To" . mail-mail-reply-to))
357 353
@@ -665,7 +661,6 @@ Here are commands that move to a header field (and create it if there isn't):
665\\[mail-signature] mail-signature (insert `mail-signature-file' file). 661\\[mail-signature] mail-signature (insert `mail-signature-file' file).
666\\[mail-yank-original] mail-yank-original (insert current message, in Rmail). 662\\[mail-yank-original] mail-yank-original (insert current message, in Rmail).
667\\[mail-fill-yanked-message] mail-fill-yanked-message (fill what was yanked). 663\\[mail-fill-yanked-message] mail-fill-yanked-message (fill what was yanked).
668\\[mail-sent-via] mail-sent-via (add a sent-via field for each To or CC).
669Turning on Mail mode runs the normal hooks `text-mode-hook' and 664Turning on Mail mode runs the normal hooks `text-mode-hook' and
670`mail-mode-hook' (in that order)." 665`mail-mode-hook' (in that order)."
671 (make-local-variable 'mail-reply-action) 666 (make-local-variable 'mail-reply-action)
@@ -1346,6 +1341,9 @@ just append to the file, in Babyl format if necessary."
1346 (point))))) 1341 (point)))))
1347 ;; Insert a copy, with altered header field name. 1342 ;; Insert a copy, with altered header field name.
1348 (insert-before-markers "Sent-via:" to-line)))))) 1343 (insert-before-markers "Sent-via:" to-line))))))
1344
1345(make-obsolete 'mail-sent-via "nobody can remember what it is for." "24.1")
1346
1349 1347
1350(defun mail-to () 1348(defun mail-to ()
1351 "Move point to end of To field, creating it if necessary." 1349 "Move point to end of To field, creating it if necessary."