From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 21 Sep 1994 18:42:05 +0000 (+0000)
Subject: (emerge-recenter, emerge-operate-on-windows):
X-Git-Tag: emacs-19.34~6880
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f405e887974f9059d63360b867432fe99dbbdd23;p=emacs.git

(emerge-recenter, emerge-operate-on-windows):
Use `visible' when calling get-buffer-window.
---

diff --git a/lisp/emerge.el b/lisp/emerge.el
index 250df827d13..99b1ec1ff78 100644
--- a/lisp/emerge.el
+++ b/lisp/emerge.el
@@ -1554,8 +1554,8 @@ With an argument, reestablish the default three-window display."
       (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 @@ With an argument, reestablish the default three-window display."
   (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)