# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 780172925 0
# Node ID 0d7b32820221b4d92d669147fbf76a2a7d251257
# Parent  99d8538efe2fa490c515bac0cd11378ff9267233
(emerge-recenter, emerge-operate-on-windows):
Use `visible' when calling get-buffer-window.

diff -r 99d8538efe2f -r 0d7b32820221 lisp/emerge.el
--- 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)