diff options
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 | ||