Merge from CEDET upstream (8569).

[gnu-emacs] / lisp / window.el

diff --git a/lisp/window.el b/lisp/window.el
index a2acd2a81b0ef768935ee76420ac421e7c14642a..86d93c0a9f6fbd4bf725bf0cc0721c886f7a223b 100644 (file)
--- 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))