emacs-elpa-diffs
[Top][All Lists]
Advanced

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

[elpa] scratch/add-vdiff fb3097c 247/258: vdiff: Check if window exists


From: Justin Burkett
Subject: [elpa] scratch/add-vdiff fb3097c 247/258: vdiff: Check if window exists before forcing vscroll
Date: Wed, 17 May 2017 08:14:02 -0400 (EDT)

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

    vdiff: Check if window exists before forcing vscroll
---
 vdiff.el | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/vdiff.el b/vdiff.el
index 1f7ed04..bc9234a 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -1357,10 +1357,12 @@ buffer)."
    (lambda ()
      (unless vdiff--setting-vscroll
        (let ((vdiff--setting-vscroll t))
-         (when (and vscroll
-                    (eq vdiff-subtraction-style 'full))
-           (set-window-vscroll window vscroll))
-         (force-window-update window))))))
+         (when (and (windowp window)
+                    (window-live-p window))
+           (when (and vscroll
+                      (eq vdiff-subtraction-style 'full))
+             (set-window-vscroll window vscroll))
+           (force-window-update window)))))))
 
 (defun vdiff--flag-new-command ()
   (setq vdiff--new-command t))



reply via email to

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