aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong2012-04-03 18:21:47 +0800
committerChong Yidong2012-04-03 18:21:47 +0800
commit529c06b6cbcd4081671cd1fd9e0bd0ecd84feac2 (patch)
tree565e3020a24cd6e2957b70b469e38555c2d5fa2f /lisp
parent7d301ae648e97a9b72d4f7f886871df78dbc7a8e (diff)
downloademacs-529c06b6cbcd4081671cd1fd9e0bd0ecd84feac2.tar.gz
emacs-529c06b6cbcd4081671cd1fd9e0bd0ecd84feac2.zip
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.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/mail/sendmail.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 937ae7575d0..f811eb2ab81 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-04-03 Chong Yidong <cyd@gnu.org>
2
3 * mail/sendmail.el (mail-mode-map): Bind C-c C-i to
4 mail-insert-file, not its obsolete alias mail-attach-file.
5
12012-04-03 Michael Albinus <michael.albinus@gmx.de> 62012-04-03 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * notifications.el (notifications-notify): Fix docstring. 8 * notifications.el (notifications-notify): Fix docstring.
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 4e2d827fc29..933eaef8119 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -304,7 +304,7 @@ The default value matches citations like `foo-bar>' plus whitespace."
304 (define-key map "\C-c\C-w" 'mail-signature) 304 (define-key map "\C-c\C-w" 'mail-signature)
305 (define-key map "\C-c\C-c" 'mail-send-and-exit) 305 (define-key map "\C-c\C-c" 'mail-send-and-exit)
306 (define-key map "\C-c\C-s" 'mail-send) 306 (define-key map "\C-c\C-s" 'mail-send)
307 (define-key map "\C-c\C-i" 'mail-attach-file) 307 (define-key map "\C-c\C-i" 'mail-insert-file)
308 ;; FIXME add this? "b" = bury buffer. It's in the menu-bar. 308 ;; FIXME add this? "b" = bury buffer. It's in the menu-bar.
309;;; (define-key map "\C-c\C-b" 'mail-dont-send) 309;;; (define-key map "\C-c\C-b" 'mail-dont-send)
310 310