[elpa] scratch/add-vdiff 95a1230 154/258: Fix vscroll bug

[Justin Burkett]

branch: scratch/add-vdiff
commit 95a1230beffee6fd1f08a0bddcd3473f067bacf8
Author: justbur <address@hidden>
Commit: justbur <address@hidden>

    Fix vscroll bug
---
 vdiff.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vdiff.el b/vdiff.el
index addb331..2e1fbc8 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -1230,7 +1230,8 @@ buffer)."
    (lambda ()
      (unless vdiff--setting-vscroll
        (let ((vdiff--setting-vscroll t))
-         (when (eq vdiff-subtraction-style 'full)
+         (when (and vscroll
+                    (eq vdiff-subtraction-style 'full))
            (set-window-vscroll window vscroll))
          (force-window-update window))))))
 
@@ -1285,8 +1286,7 @@ buffer)."
                (3-win (nth 0 3-scroll-data))
                (3-start-pos (nth 1 3-scroll-data))
                (3-pos (nth 2 3-scroll-data))
-               (3-scroll (nth 3 3-scroll-data))
-               (vdiff--in-scroll-hook t))
+               (3-scroll (nth 3 3-scroll-data)))
             (when (and 3-start-pos 3-pos)
               (set-window-point 3-win 3-pos)
               (set-window-start 3-win 3-start-pos)