From 2d197ffbe2029b479802528eeaec714df4c8a8f6 Mon Sep 17 00:00:00 2001
From: Chong Yidong
Date: Sun, 30 Oct 2011 09:56:03 +0800
Subject: Rename split-window-{above-each-other|split-window-side-by-side} to
 split-window-below and split-window-right.

* lisp/window.el (split-window-below, split-window-right): Rename from
split-window-above-each-other and split-window-side-by-side
respectively.  All callers changed.
(split-window-sensibly, split-window-sensibly): Use them.
(split-window-keep-point): Doc fix.

* lisp/isearch.el: Add isearch-scroll property to split-window-below
and split-window-right.

* lisp/follow.el (follow-mode):
* lisp/vc/pcvs-util.el (cvs-pop-to-buffer-same-frame):
* lisp/progmodes/ada-xref.el (ada-gdb-application):
* lisp/emulation/vip.el (vip-buffer-in-two-windows):
* lisp/image-dired.el (image-dired-dired-with-window-configuration):
* lisp/dired-x.el (dired-do-find-marked-files):
* lisp/dired.el (dired-pop-to-buffer):
* lisp/bs.el (bs--show-with-configuration):
* lisp/vc/emerge.el (emerge-setup-windows):
* lisp/textmodes/two-column.el (2C-two-columns):
* lisp/textmodes/reftex-toc.el (reftex-toc):
* lisp/progmodes/gdb-mi.el (gdb-setup-windows):
* lisp/progmodes/fortran.el (fortran-window-create):
* lisp/net/newst-treeview.el (newsticker--treeview-window-init):
* lisp/emulation/ws-mode.el (wordstar-C-o-map, wordstar-mode):
* lisp/emulation/tpu-edt.el (tpu-gold-map):
* lisp/emulation/crisp.el (crisp-mode-map):
* lisp/calendar/calendar.el (calendar-basic-setup): Callers changed.
---
 lisp/vc/emerge.el    | 6 +++---
 lisp/vc/pcvs-util.el | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lisp/vc')

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)))))
 
-- 
cgit v1.2.1