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

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

[elpa] externals/vlf c36db11 034/310: Return correct search success stat


From: Stefan Monnier
Subject: [elpa] externals/vlf c36db11 034/310: Return correct search success status.
Date: Sat, 28 Nov 2020 00:32:41 -0500 (EST)

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

    Return correct search success status.
---
 vlfi.el | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/vlfi.el b/vlfi.el
index 4156326..7b016e2 100644
--- a/vlfi.el
+++ b/vlfi.el
@@ -319,14 +319,14 @@ OP-TYPE specifies the file operation being performed over 
FILENAME."
                                                  vlfi-end-pos)))))
           (progress-reporter-done search-reporter))
       (if backward
-          (vlfi-end-search match-end-pos match-start-pos
+          (vlfi-goto-match match-end-pos match-start-pos
                            count to-find)
-        (vlfi-end-search match-start-pos match-end-pos
+        (vlfi-goto-match match-start-pos match-end-pos
                          count to-find)))))
 
-(defun vlfi-end-search (match-pos-start match-pos-end count to-find)
+(defun vlfi-goto-match (match-pos-start match-pos-end count to-find)
   "Move to chunk surrounding MATCH-POS-START and MATCH-POS-END.
-According to COUNT and left TO-FIND show if search has been
+According to COUNT and left TO-FIND, show if search has been
 successful.  Return nil if nothing found."
   (vlfi-move-to-batch (- match-pos-start (/ vlfi-batch-size 2)))
   (let* ((match-end (- match-pos-end vlfi-start-pos))
@@ -334,15 +334,15 @@ successful.  Return nil if nothing found."
                                 match-end)))
     (overlay-put overlay 'face 'region)
     (goto-char match-end)
-    (cond ((zerop to-find) t)
-          ((< to-find count)
-           (message "Moved to the %d match which is last found"
-                    (- count to-find))
-           t)
-          (t (message "Not found")
-             nil))
-    (sit-for 0.1)
-    (delete-overlay overlay)))
+    (prog1 (cond ((zerop to-find) t)
+                 ((< to-find count)
+                  (message "Moved to the %d match which is last found"
+                           (- count to-find))
+                  t)
+                 (t (message "Not found")
+                    nil))
+      (sit-for 0.1)
+      (delete-overlay overlay))))
 
 (defun vlfi-re-search-forward (regexp count)
   "Search forward for REGEXP prefix COUNT number of times."



reply via email to

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