sendmail.el fix for bug#1776.

* lisp/mail/sendmail.el (mail-mode-map): Remove mail-sent-via.
(mail-mode): Remove mail-sent-via from the doc.
(mail-sent-via): Make it obsolete.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 01a47fd4aaf76729391cb70f4118bde5196242de..87d7cf03eb2f4fd09c9f9fd8b86d36ccc8c08d44 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2011-03-03  Glenn Morris  <rgm@gnu.org>
 
+       * mail/sendmail.el (mail-mode-map): Remove mail-sent-via.
+       (mail-mode): Remove mail-sent-via from the doc.
+       (mail-sent-via): Make it obsolete.  (Bug#1776)
+
        * progmodes/grep.el (grep-highlight-matches): Doc fix.
        (grep-process-setup): No highlighting without font-lock.  (Bug#8084)
 

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 77ae87b54494ec02a81f6328f1c7238605b0ceb0..0548f24b1dd4ef21fe620e7283dea23c464ab622 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -309,7 +309,6 @@ The default value matches citations like `foo-bar>' plus whitespace."
     (define-key map [remap split-line] 'mail-split-line)
     (define-key map "\C-c\C-q" 'mail-fill-yanked-message)
     (define-key map "\C-c\C-w" 'mail-signature)
-    (define-key map "\C-c\C-v" 'mail-sent-via)
     (define-key map "\C-c\C-c" 'mail-send-and-exit)
     (define-key map "\C-c\C-s" 'mail-send)
     (define-key map "\C-c\C-i" 'mail-attach-file)
@@ -349,9 +348,6 @@ The default value matches citations like `foo-bar>' plus whitespace."
     (define-key map [menu-bar headers expand-aliases]
       '("Expand Aliases" . expand-mail-aliases))
 
-    (define-key map [menu-bar headers sent-via]
-      '("Sent-Via" . mail-sent-via))
-
     (define-key map [menu-bar headers mail-reply-to]
       '("Mail-Reply-To" . mail-mail-reply-to))
 
@@ -665,7 +661,6 @@ Here are commands that move to a header field (and create it if there isn't):
 \\[mail-signature]  mail-signature (insert `mail-signature-file' file).
 \\[mail-yank-original]  mail-yank-original (insert current message, in Rmail).
 \\[mail-fill-yanked-message]  mail-fill-yanked-message (fill what was yanked).
-\\[mail-sent-via]  mail-sent-via (add a sent-via field for each To or CC).
 Turning on Mail mode runs the normal hooks `text-mode-hook' and
 `mail-mode-hook' (in that order)."
   (make-local-variable 'mail-reply-action)
@@ -1346,6 +1341,9 @@ just append to the file, in Babyl format if necessary."
                                   (point)))))
          ;; Insert a copy, with altered header field name.
          (insert-before-markers "Sent-via:" to-line))))))
+
+(make-obsolete 'mail-sent-via "nobody can remember what it is for." "24.1")
+
 \f
 (defun mail-to ()
   "Move point to end of To field, creating it if necessary."