Merge from trunk.

1 files changed, 24 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d9aadbe0f22..054b3ca5f47 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,27 @@
+2012-04-18  Chong Yidong  <cyd@gnu.org>
+
+        * simple.el (line-move): Use forward-line if in batch mode
+        (Bug#11053).
+
+2012-04-18  Christopher Schmidt  <christopher@ch.ristopher.com>
+
+        * files.el (after-find-file): Do not try to add a final newline if
+        the buffer is read-only (Bug#11156).
+
+2012-04-17  Richard Stallman  <rms@gnu.org>
+
+        * mail/rmail.el (rmail-start-mail):
+        Pass (rmail-mail-return...) for the return-action.
+        Pass (rmail-yank-current-message...) for the yank-action.
+        (rmail-yank-current-message): New function.
+        (rmail-mail): Pass the Rmail buffer, not view buffer, for replybuffer.
+        (rmail-reply): Likewise.
+        (rmail-forward): Pass the Rmail buffer, not nil, for replybuffer.
+
+        * mail/sendmail.el (mail-bury): Choose the first rmail-mode
+        buffer, not the last.  Reject temp buffers.  Use the rmail-mode
+        buffer, not newbuf.
+
 2012-04-17  Juanma Barranquero  <lekktu@gmail.com>
 
         * server.el (server-ensure-safe-dir): Simplify.