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

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

[elpa] externals/vlf bc398d6 291/310: - don't adjust start on next occur


From: Stefan Monnier
Subject: [elpa] externals/vlf bc398d6 291/310: - don't adjust start on next occur batch
Date: Sat, 28 Nov 2020 00:33:34 -0500 (EST)

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

    - don't adjust start on next occur batch
    - don't gather profile info for adjustment insert as it's too small
---
 vlf-base.el  | 4 ++--
 vlf-occur.el | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/vlf-base.el b/vlf-base.el
index 42d1865..0cc9709 100644
--- a/vlf-base.el
+++ b/vlf-base.el
@@ -307,8 +307,8 @@ Return number of bytes moved back for proper decoding."
          (strict (or (= sample-end vlf-file-size)
                      (and (not adjust-end) (= sample-end end))))
          (shift 0))
-    (while (and (progn (vlf-insert-file-contents-1 safe-start
-                                                   sample-end)
+    (while (and (progn (insert-file-contents buffer-file-name
+                                             nil safe-start sample-end)
                        (not (zerop safe-start)))
                 (< shift 3)
                 (let ((diff (- chunk-size
diff --git a/vlf-occur.el b/vlf-occur.el
index 8b6d7c4..5b956d1 100644
--- a/vlf-occur.el
+++ b/vlf-occur.el
@@ -341,7 +341,8 @@ Prematurely ending indexing will still show what's found so 
far."
                               (vlf-tune-encode-length (point-min)
                                                       batch-point))))))
                   (vlf-tune-batch tune-types)
-                  (vlf-move-to-chunk start (+ start vlf-batch-size)))
+                  (setq vlf-end-pos start) ;not to adjust start
+                  (vlf-move-to-chunk-2 start (+ start vlf-batch-size)))
                 (setq match-start-point (point-min)
                       match-end-point match-start-point)
                 (goto-char match-end-point)



reply via email to

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