Two minor doc/consistency fixes.

* doc/emacs/sending.texi (Mail Misc): Fix an index entry.

* lisp/mail/sendmail.el (mail-mode-map): Bind C-c C-i to
mail-insert-file, not its obsolete alias mail-attach-file.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index ffc73813378ada7a89f7029bcec9e4313ee99eca..cbb96fe3c22e8063de249aebce15e8d9a1c4ae58 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-03  Chong Yidong  <cyd@gnu.org>
+
+       * sending.texi (Mail Misc): Fix an index entry.
+
 2012-04-02  Eli Zaretskii  <eliz@gnu.org>
 
        * msdog.texi (Windows Startup): Add description of emacsclient

diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi
index a2cb5d9f8f297fe2f5fdf4d35db6a84610d77014..5e80eb108248d46dd8b626b01171092dc8e6c9f9 100644 (file)
--- a/doc/emacs/sending.texi
+++ b/doc/emacs/sending.texi
@@ -521,7 +521,7 @@ package, which provides more flexible citation
 @subsection Mail Miscellany
 
 @kindex C-c C-a @r{(Message mode)}
-@findex mail-attach-file
+@findex mml-attach-file
 @cindex MIME
 @cindex Multipurpose Internet Mail Extensions
   You can @dfn{attach} a file to an outgoing message by typing

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 937ae7575d026403d561104257238d47f51ea0d0..f811eb2ab8183bf13a9ae1804f03b15c113b0790 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-03  Chong Yidong  <cyd@gnu.org>
+
+       * mail/sendmail.el (mail-mode-map): Bind C-c C-i to
+       mail-insert-file, not its obsolete alias mail-attach-file.
+
 2012-04-03  Michael Albinus  <michael.albinus@gmx.de>
 
        * notifications.el (notifications-notify): Fix docstring.

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 4e2d827fc29cd15dc4d903314d646b7e753595a9..933eaef8119cf81e18b636091cb99616b55d7758 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -304,7 +304,7 @@ The default value matches citations like `foo-bar>' plus whitespace."
     (define-key map "\C-c\C-w" 'mail-signature)
     (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)
+    (define-key map "\C-c\C-i" 'mail-insert-file)
     ;; FIXME add this? "b" = bury buffer.  It's in the menu-bar.
 ;;;    (define-key map "\C-c\C-b" 'mail-dont-send)