From: Glenn Morris <rgm@gnu.org>
Date: Sun, 10 Jun 2012 04:37:41 +0000 (-0700)
Subject: * mail/rmail.el (rmail-yank-current-message): Leave point at correct position.
X-Git-Tag: emacs-24.1~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9e1b8ec4c15afb5731f33721fc17b73cace78ea4;p=emacs.git

* mail/rmail.el (rmail-yank-current-message): Leave point at correct position.

Fixes: debbugs:11660
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d788989396a..6a6b29e2fe0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,11 @@
 
 	* Version 24.1 released.
 
+2012-06-01  Glenn Morris  <rgm@gnu.org>
+
+	* mail/rmail.el (rmail-yank-current-message):
+	Leave point at correct position.  (Bug#11660)
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
 	* allout-widgets.el: Fix code header
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index f8e7b405b96..18f89737f19 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3567,7 +3567,7 @@ If BUFFER is not swapped, yank out of its message viewer buffer."
   (with-current-buffer buffer
     (unless (rmail-buffers-swapped-p)
       (setq buffer rmail-view-buffer)))
-  (insert-buffer buffer)
+  (insert-buffer-substring buffer)
   ;; If they yank the text of BUFFER, the encoding of BUFFER is a
   ;; better default for the reply message than the default value of
   ;; buffer-file-coding-system.