[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."
- [elpa] externals/vlf 748fd14 027/310: More key-binding simplification., (continued)
- [elpa] externals/vlf 748fd14 027/310: More key-binding simplification., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 670561e 031/310: Optimize search a bit., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf ab20671 033/310: Abstract batch overlapping during search and optimize a bit., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf e387ed5 035/310: Add forgotten local variable statement and documentation., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 0dd4ba8 014/310: Add regex search forward functionality., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 9e27aeb 021/310: Keep stable cursor position when moving through chunks., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 81e4fe1 016/310: Merge branch 'search' of https://github.com/m00natic/vlfi into search, Stefan Monnier, 2020/11/28
- [elpa] externals/vlf e43725e 007/310: Add autoload cookies to fix package installation., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 853386f 015/310: Add regex search forward functionality., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 2a7625a 024/310: Improve correctness of search forward., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf c36db11 034/310: Return correct search success status.,
Stefan Monnier <=
- [elpa] externals/vlf 8a33dbf 036/310: Add something like edit minor mode., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 56134a8 050/310: Make vlfi usable under GNU Emacs 23., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 24675d8 054/310: Manage modification times when attempting to save., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf c4f87f9 048/310: Move save interception to vlfi-mode., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf c14c7f0 058/310: Add shift forward of file contents when edited chunk grows in size., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf e115e7e 053/310: Add custom revert function., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 2edbb6b 004/310: Add vlf as an option when opening large files., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 80ca6b6 037/310: Fix vlfi invocation when prompted for large files., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 03f3233 039/310: Don't reinsert content and move on successful search., Stefan Monnier, 2020/11/28
- [elpa] externals/vlf 2525ebf 049/310: Improvements to file saving., Stefan Monnier, 2020/11/28