Merge from trunk.

2 files changed, 4 insertions, 4 deletions

diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el
index 5435a840ac9..3ba5bcdb90a 100644
--- a/lisp/vc/emerge.el
+++ b/lisp/vc/emerge.el
@@ -1354,8 +1354,8 @@ Otherwise, the A or B file present is copied to the output file."
   (delete-other-windows)
   (switch-to-buffer merge-buffer)
   (emerge-refresh-mode-line)
-  (split-window-vertically)
-  (split-window-horizontally)
+  (split-window-below)
+  (split-window-right)
   (switch-to-buffer buffer-A)
   (if pos
       (goto-char (point-min)))
@@ -2121,7 +2121,7 @@ Use C-u l to reset the windows afterward."
   (delete-other-windows)
   (let ((temp-buffer-show-function
          (lambda (buf)
-           (split-window-vertically)
+           (split-window-below)
            (switch-to-buffer buf)
            (other-window 1))))
     (with-output-to-temp-buffer "*Help*"
diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el
index 752016a0392..311841d37a0 100644
--- a/lisp/vc/pcvs-util.el
+++ b/lisp/vc/pcvs-util.el
@@ -88,7 +88,7 @@ try to split a new window instead."
         (pop-up-frames nil))
     (or (let ((buf (get-buffer-window buf))) (and buf (select-window buf)))
         (and pop-up-windows
-             (ignore-errors (select-window (split-window-vertically)))
+             (ignore-errors (select-window (split-window-below)))
              (switch-to-buffer buf))
         (pop-to-buffer (current-buffer)))))