[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/el-search 6c5a6b4 265/332: [el-search] Fix an infloop i
From: |
Stefan Monnier |
Subject: |
[elpa] externals/el-search 6c5a6b4 265/332: [el-search] Fix an infloop in el-search--search-pattern-1 |
Date: |
Tue, 1 Dec 2020 15:49:00 -0500 (EST) |
branch: externals/el-search
commit 6c5a6b4bd6c73b216f64af2ebd23a7439bdd6566
Author: Michael Heerdegen <michael_heerdegen@web.de>
Commit: Michael Heerdegen <michael_heerdegen@web.de>
[el-search] Fix an infloop in el-search--search-pattern-1
Also bump version to 1.7.11.
* packages/el-search/el-search.el (el-search--search-pattern-1): Move
forward if a match is discarded because it exceeds a given BOUND.
---
el-search.el | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/el-search.el b/el-search.el
index 3939b97..1640f55 100644
--- a/el-search.el
+++ b/el-search.el
@@ -7,7 +7,7 @@
;; Created: 29 Jul 2015
;; Keywords: lisp
;; Compatibility: GNU Emacs 25
-;; Version: 1.7.10
+;; Version: 1.7.11
;; Package-Requires: ((emacs "25") (stream "2.2.4") (cl-print "1.0"))
@@ -1135,12 +1135,11 @@ be specified as fourth argument, and COUNT becomes the
fifth argument."
;; the thunk hasn't been forced
(scan-lists (point) 1 0))))
((el-search--match-p matcher current-expr)
- (setq match-beg
- (and (or (not bound)
- (<= (el-search--end-of-sexp match-beg)
bound)
- ;; don't fail for >: a subsequent match
may end before BOUND
- )
- (point))))
+ (if (or (not bound)
+ (<= (el-search--end-of-sexp match-beg) bound))
+ (setq match-beg (point))
+ ;; don't fail: a subsequent match may end before BOUND
+ (el-search--skip-expression current-expr)))
(t (el-search--skip-expression current-expr))))
(when (and bound (<= bound (point)))
(throw 'no-match t)))
- [elpa] externals/el-search c41288f 208/332: Make el-search key binding installation more flexible, (continued)
- [elpa] externals/el-search c41288f 208/332: Make el-search key binding installation more flexible, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 8d20f8a 217/332: Add face `el-search-highlight-in-prompt-face', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 75f94f9 218/332: Improve quit/error handling in el-search-query-replace, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search b278fb7 219/332: Update a variable when splicing mode is toggled, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 8175417 237/332: * el-search/el-search.el: More minor tweaks, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 1f81442 241/332: [el-search] Improve forward search functions, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 5c3bd4e 247/332: [el-search] Add bindings for first/last match jumping, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 3699425 246/332: [el-search] Add command 'el-search-last-buffer-match', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search cf68daf 249/332: [el-search] Avoid most calls to 'scan-sexps', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 894f8b1 254/332: [el-search] More minor tweaks, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 6c5a6b4 265/332: [el-search] Fix an infloop in el-search--search-pattern-1,
Stefan Monnier <=
- [elpa] externals/el-search b830be5 263/332: [el-search] Some scrolling tweaks, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search e60f228 267/332: [el-search] Don't try to kill modified buffers, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 34f734e 258/332: [el-search] Add special scroll commands, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search d4ad652 278/332: [el-search] Implement an explicit quit command, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search fbe70bf 284/332: [el-search] Add C-h help, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search fac5586 285/332: [el-search] Improve my last commit "Add C-h help", Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 23911d1 288/332: [el-search] Add menus, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 68fcfcd 286/332: [el-search] Include preceding comments in occur defun context, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 90062c5 290/332: Update copyrights of some packages, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 120c662 296/332: [el-search] Minibuffer pattern prompt hints part 2, Stefan Monnier, 2020/12/01