🚀 go-pugleaf

In GNU Emacs 19.25.94.1 (rs6000-ibm-aix3.2.5) of Mon Aug 15 1994 on marc.watson.ibm.com

If you try to rearrange an emerge session in several frames, emerge
stops working.  The following patch, which has been only minimally
tested, improves the situation.

What it does is use the 'visible option on the get-buffer-window
calls, so the emerge buffer windows are found even if they are visible in
other frames.

Marc Auslander   <marc@watson.ibm.com>   914 784-6699  (Tieline 863 Fax x6306)

*** lisp/emerge.el	Fri Apr 15 22:32:57 1994
--- emerge.el	Mon Aug 15 14:20:17 1994
***************
*** 1554,1561 ****
        (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))
  	     (merge-window (get-buffer-window merge-buffer))
  	     (diff-vector
  	      (aref emerge-difference-list emerge-current-difference)))
--- 1554,1561 ----
        (let* ((merge-buffer emerge-merge-buffer)
  	     (buffer-A emerge-A-buffer)
  	     (buffer-B emerge-B-buffer)
! 	     (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,1606 ****
    (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))
  	 (merge-window (get-buffer-window merge-buffer)))
      (if window-A (progn
  		   (select-window window-A)
--- 1599,1606 ----
    (let* ((merge-buffer emerge-merge-buffer)
  	 (buffer-A emerge-A-buffer)
  	 (buffer-B emerge-B-buffer)
! 	 (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)