From: Chong Yidong <cyd@stupidchicken.com>
Date: Wed, 24 Mar 2010 16:18:13 +0000 (-0400)
Subject: Fix 2009-11-13 change to append-to-buffer (Bug#5749).
X-Git-Tag: emacs-pretest-23.1.95~43
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d0fba1745fc6b4a9b078957cae994ff694ba5efe;p=emacs.git

Fix 2009-11-13 change to append-to-buffer (Bug#5749).

* simple.el (append-to-buffer): Ensure that point is preserved if
BUFFER is the current buffer.  Suggested by YAMAMOTO Mitsuharu.
(Bug#5749)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a83786a5927..4cfb8549b46 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-24  Chong Yidong  <cyd@stupidchicken.com>
+
+	* simple.el (append-to-buffer): Ensure that point is preserved if
+	BUFFER is the current buffer.  Suggested by YAMAMOTO Mitsuharu.
+	(Bug#5749)
+
 2010-03-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* progmodes/make-mode.el (makefile-rule-action-regex): Backtrack less.
diff --git a/lisp/simple.el b/lisp/simple.el
index 30498ea2704..2adf4756dca 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3473,12 +3473,13 @@ START and END specify the portion of the current buffer to be copied."
            (windows (get-buffer-window-list append-to t t))
            point)
       (with-current-buffer append-to
-	(setq point (point))
-	(barf-if-buffer-read-only)
-	(insert-buffer-substring oldbuf start end)
-	(dolist (window windows)
-	  (when (= (window-point window) point)
-	    (set-window-point window (point))))))))
+	(save-excursion
+	  (setq point (point))
+	  (barf-if-buffer-read-only)
+	  (insert-buffer-substring oldbuf start end)
+	  (dolist (window windows)
+	    (when (= (window-point window) point)
+	      (set-window-point window (point)))))))))
 
 (defun prepend-to-buffer (buffer start end)
   "Prepend to specified buffer the text of the region.