diff options
| author | Chong Yidong | 2011-10-30 09:56:03 +0800 |
|---|---|---|
| committer | Chong Yidong | 2011-10-30 09:56:03 +0800 |
| commit | 2d197ffbe2029b479802528eeaec714df4c8a8f6 (patch) | |
| tree | 970da6796e7ba009cd561928f735c2eea41e8f29 /lisp/vc | |
| parent | 196e41e4aec1a44ec5b6e9bed485185ba872ae67 (diff) | |
| download | emacs-2d197ffbe2029b479802528eeaec714df4c8a8f6.tar.gz emacs-2d197ffbe2029b479802528eeaec714df4c8a8f6.zip | |
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.
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/emerge.el | 6 | ||||
| -rw-r--r-- | lisp/vc/pcvs-util.el | 2 |
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." | |||
| 1354 | (delete-other-windows) | 1354 | (delete-other-windows) |
| 1355 | (switch-to-buffer merge-buffer) | 1355 | (switch-to-buffer merge-buffer) |
| 1356 | (emerge-refresh-mode-line) | 1356 | (emerge-refresh-mode-line) |
| 1357 | (split-window-vertically) | 1357 | (split-window-below) |
| 1358 | (split-window-horizontally) | 1358 | (split-window-right) |
| 1359 | (switch-to-buffer buffer-A) | 1359 | (switch-to-buffer buffer-A) |
| 1360 | (if pos | 1360 | (if pos |
| 1361 | (goto-char (point-min))) | 1361 | (goto-char (point-min))) |
| @@ -2121,7 +2121,7 @@ Use C-u l to reset the windows afterward." | |||
| 2121 | (delete-other-windows) | 2121 | (delete-other-windows) |
| 2122 | (let ((temp-buffer-show-function | 2122 | (let ((temp-buffer-show-function |
| 2123 | (lambda (buf) | 2123 | (lambda (buf) |
| 2124 | (split-window-vertically) | 2124 | (split-window-below) |
| 2125 | (switch-to-buffer buf) | 2125 | (switch-to-buffer buf) |
| 2126 | (other-window 1)))) | 2126 | (other-window 1)))) |
| 2127 | (with-output-to-temp-buffer "*Help*" | 2127 | (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." | |||
| 88 | (pop-up-frames nil)) | 88 | (pop-up-frames nil)) |
| 89 | (or (let ((buf (get-buffer-window buf))) (and buf (select-window buf))) | 89 | (or (let ((buf (get-buffer-window buf))) (and buf (select-window buf))) |
| 90 | (and pop-up-windows | 90 | (and pop-up-windows |
| 91 | (ignore-errors (select-window (split-window-vertically))) | 91 | (ignore-errors (select-window (split-window-below))) |
| 92 | (switch-to-buffer buf)) | 92 | (switch-to-buffer buf)) |
| 93 | (pop-to-buffer (current-buffer))))) | 93 | (pop-to-buffer (current-buffer))))) |
| 94 | 94 | ||