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

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

[elpa] master 211b4a7: [el-search] Fix an infloop in el-search--search-p


From: Michael Heerdegen
Subject: [elpa] master 211b4a7: [el-search] Fix an infloop in el-search--search-pattern-1
Date: Sat, 3 Nov 2018 12:16:33 -0400 (EDT)

branch: master
commit 211b4a75523366c1deade6768f137c9e821c2db0
Author: Michael Heerdegen <address@hidden>
Commit: Michael Heerdegen <address@hidden>

    [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.
---
 packages/el-search/el-search.el | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el
index 3939b97..1640f55 100644
--- a/packages/el-search/el-search.el
+++ b/packages/el-search/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)))



reply via email to

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