2 files changed, 8 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 384e15f758c..6e0b22c9835 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-25  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer): In display-buffer bind
+        split-window-keep-point to t, bug#14829.
+
 2013-07-25  Juanma Barranquero  <lekktu@gmail.com>
 
         * desktop.el: Rename internal "desktop-X" frame params to "desktop--X".
diff --git a/lisp/window.el b/lisp/window.el
index a2acd2a81b0..86d93c0a9f6 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5470,6 +5470,9 @@ argument, ACTION is t."
   (let ((buffer (if (bufferp buffer-or-name)
                     buffer-or-name
                   (get-buffer buffer-or-name)))
+        ;; Make sure that when we split windows the old window keeps
+        ;; point, bug#14829.
+        (split-window-keep-point t)
         ;; Handle the old form of the first argument.
         (inhibit-same-window (and action (not (listp action)))))
     (unless (listp action) (setq action nil))