Mercurial > emacs
changeset 8974:0d7b32820221
(emerge-recenter, emerge-operate-on-windows):
Use `visible' when calling get-buffer-window.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Wed, 21 Sep 1994 18:42:05 +0000 |
| parents | 99d8538efe2f |
| children | e8a4c71251cb |
| files | lisp/emerge.el |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/emerge.el Wed Sep 21 18:37:00 1994 +0000 +++ b/lisp/emerge.el Wed Sep 21 18:42:05 1994 +0000 @@ -1554,8 +1554,8 @@ (let* ((merge-buffer emerge-merge-buffer) (buffer-A emerge-A-buffer) (buffer-B emerge-B-buffer) - (window-A (get-buffer-window buffer-A)) - (window-B (get-buffer-window buffer-B)) + (window-A (get-buffer-window buffer-A 'visible)) + (window-B (get-buffer-window buffer-B 'visible)) (merge-window (get-buffer-window merge-buffer)) (diff-vector (aref emerge-difference-list emerge-current-difference))) @@ -1599,8 +1599,8 @@ (let* ((merge-buffer emerge-merge-buffer) (buffer-A emerge-A-buffer) (buffer-B emerge-B-buffer) - (window-A (get-buffer-window buffer-A)) - (window-B (get-buffer-window buffer-B)) + (window-A (get-buffer-window buffer-A 'visible)) + (window-B (get-buffer-window buffer-B 'visible)) (merge-window (get-buffer-window merge-buffer))) (if window-A (progn (select-window window-A)