[Emacs-diffs] /srv/bzr/emacs/trunk r107743: Two minor doc/consistency fixes.

[Chong Yidong]

------------------------------------------------------------
revno: 107743
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2012-04-03 18:21:47 +0800
message:
  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.
modified:
  doc/emacs/ChangeLog
  doc/emacs/sending.texi
  lisp/ChangeLog
  lisp/mail/sendmail.el

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-04-02 17:33:41 +0000
+++ b/doc/emacs/ChangeLog       2012-04-03 10:21:47 +0000
@@ -1,3 +1,7 @@
+2012-04-03  Chong Yidong  <address@hidden>
+
+       * sending.texi (Mail Misc): Fix an index entry.
+
 2012-04-02  Eli Zaretskii  <address@hidden>
 
        * msdog.texi (Windows Startup): Add description of emacsclient

=== modified file 'doc/emacs/sending.texi'
--- a/doc/emacs/sending.texi    2012-02-15 03:15:26 +0000
+++ b/doc/emacs/sending.texi    2012-04-03 10:21:47 +0000
@@ -521,7 +521,7 @@
 @subsection Mail Miscellany
 
 @kindex C-c C-a @r{(Message mode)}
address@hidden mail-attach-file
address@hidden mml-attach-file
 @cindex MIME
 @cindex Multipurpose Internet Mail Extensions
   You can @dfn{attach} a file to an outgoing message by typing

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-03 07:20:32 +0000
+++ b/lisp/ChangeLog    2012-04-03 10:21:47 +0000
@@ -1,3 +1,8 @@
+2012-04-03  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * notifications.el (notifications-notify): Fix docstring.

=== modified file 'lisp/mail/sendmail.el'
--- a/lisp/mail/sendmail.el     2012-03-13 23:27:56 +0000
+++ b/lisp/mail/sendmail.el     2012-04-03 10:21:47 +0000
@@ -304,7 +304,7 @@
     (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)