[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] scratch/add-vdiff 702f27b 2/4: Consider windows on all frames

From: Justin Burkett
Subject: [elpa] scratch/add-vdiff 702f27b 2/4: Consider windows on all frames
Date: Wed, 17 May 2017 15:59:02 -0400 (EDT)

branch: scratch/add-vdiff
commit 702f27b5092ea0cea09cf9642739df34d39a0cbe
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>

    Consider windows on all frames
    in vdiff--all-windows and vdiff-buffers.
 vdiff.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vdiff.el b/vdiff.el
index ba26feb..e96b18c 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -306,7 +306,7 @@ because those are handled differently.")
 (defun vdiff--all-windows ()
   (remq nil
-        (mapcar #'get-buffer-window
+        (mapcar (lambda (buf) (get-buffer-window buf 0))
                 (vdiff-session-buffers vdiff--session))))
 (defun vdiff--all-overlays (ovr)
@@ -590,8 +590,8 @@ an addition when compared to other vdiff buffers."
 parsing the diff output and triggering the overlay updates."
   (unless vdiff--inhibit-diff-update
     (let ((parse-func (if (process-get proc 'vdiff-3way)
-                          'vdiff--parse-diff3
-                        'vdiff--parse-diff))
+                          #'vdiff--parse-diff3
+                        #'vdiff--parse-diff))
           (ses (process-get proc 'vdiff-session))
           (post-function (process-get proc 'vdiff-post-refresh-function))
@@ -1667,7 +1667,7 @@ function for ON-QUIT to do something useful with the 
         (format "[Buffer 1 %s] Buffer 2: " buffer-a)
-        (window-buffer (next-window (selected-window)))))
+        (window-buffer (next-window (selected-window) nil 0))))
   (let ((prior-window-config (when restore-windows-on-quit

reply via email to

[Prev in Thread] Current Thread [Next in Thread]