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

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

[elpa] externals/vlf 30d2bb0 208/310: VLF buffer ediff now starts from t


From: Stefan Monnier
Subject: [elpa] externals/vlf 30d2bb0 208/310: VLF buffer ediff now starts from the current chunks.
Date: Sat, 28 Nov 2020 00:33:17 -0500 (EST)

branch: externals/vlf
commit 30d2bb0d25488f6445ed2bd9b69d3308c629d151
Author: Andrey Kotlarski <m00naticus@gmail.com>
Commit: Andrey Kotlarski <m00naticus@gmail.com>

    VLF buffer ediff now starts from the current chunks.
---
 vlf-ediff.el | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/vlf-ediff.el b/vlf-ediff.el
index 76c5111..ae53c90 100644
--- a/vlf-ediff.el
+++ b/vlf-ediff.el
@@ -53,12 +53,10 @@ respectively of difference list, runs ediff over the 
adjacent chunks."
                         t))))
   (set-buffer buffer-A)
   (setq buffer-A (current-buffer)) ;names change, so reference by buffer object
-  (let ((vlf-size vlf-batch-size))
-    (vlf-beginning-of-file)
+  (let ((batch-size vlf-batch-size))
     (set-buffer buffer-B)
     (setq buffer-B (current-buffer))
-    (setq vlf-batch-size vlf-size))
-  (vlf-beginning-of-file)
+    (vlf-set-batch-size batch-size))
   (ediff-buffers buffer-A buffer-B
                  '((lambda () (setq vlf-ediff-session t)
                      (vlf-ediff-next ediff-buffer-A ediff-buffer-B
@@ -96,7 +94,8 @@ respectively of difference list, runs ediff over the adjacent 
chunks."
                                    (ediff-get-default-file-name f 1)))
            (read-number "Batch size (in bytes): " vlf-batch-size))))
   (let ((buffer-A (vlf file-A)))
-    (set (make-local-variable 'vlf-batch-size) batch-size)
+    (set-buffer buffer-A)
+    (vlf-set-batch-size batch-size)
     (let ((buffer-B (vlf file-B)))
       (vlf-ediff-buffers buffer-A buffer-B))))
 



reply via email to

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