mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-23 10:34:07 +00:00
Code Issues Releases Activity

(emerge-recenter, emerge-operate-on-windows):

Browse Source 
Use `visible' when calling get-buffer-window.
This commit is contained in:
Richard M. Stallman 1994-09-21 18:42:05 +00:00
parent 4cc32db661
commit f405e88797
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/emerge.el
View File

@ -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)