Don't bind C-x m, C-x 4 m, C-x 5 m.

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 7444a79aa0e35ff3a9d77ab91a938f496aaae1ea..e60156977a24b697a6302f5d49620cd2c560aca3 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1115,7 +1115,10 @@ and don't delete any header fields."
       (or (bolp) (newline))
       (goto-char start))))
 \f
-;; Put these last, to reduce chance of lossage from quitting in middle of loading the file.
+;; Put these commands last, to reduce chance of lossage from quitting
+;; in middle of loading the file.
+
+;;;###autoload (add-hook 'same-window-buffer-names "*mail*")
 
 ;;;###autoload
 (defun mail (&optional noerase to subject in-reply-to cc replybuffer actions)
@@ -1267,14 +1270,6 @@ The seventh argument ACTIONS is a list of actions to take
     (pop-to-buffer "*mail*"))
   (mail noerase to subject in-reply-to cc replybuffer sendactions))
 
-;;; Do not execute these when sendmail.el is loaded,
-;;; only in loaddefs.el.
-;;;###autoload (define-key ctl-x-map "m" 'mail)
-;;;###autoload (define-key ctl-x-4-map "m" 'mail-other-window)
-;;;###autoload (define-key ctl-x-5-map "m" 'mail-other-frame)
-
-;;;###autoload (add-hook 'same-window-buffer-names "*mail*")
-
 ;;; Do not add anything but external entries on this page.
 
 (provide 'sendmail)