branch: externals/hyperbole commit 012c0ceed63ee8b0d3ab1cc6272f16007565ce82 Author: bw <r...@gnu.org> Commit: bw <r...@gnu.org>
hyrolo-grep-file - Fix to not skip past entry prefix of first match --- ChangeLog | 5 +++++ hyrolo.el | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83c3199c36..879645bc84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2024-03-31 Bob Weiner <r...@gnu.org> +* hyrolo.el (hyrolo-grep-file): Remove this line that was skipping past the + beginning of the first matching entry regexp and making matching entry + count too low by 1: + (re-search-forward hyrolo-hdr-and-entry-regexp nil t) + * hpath.el (hpath:expand-list): Fix to properly expand a dir when 'exists-flag' is t. 2024-03-30 Bob Weiner <r...@gnu.org> diff --git a/hyrolo.el b/hyrolo.el index df818b4b01..4ec23435d7 100644 --- a/hyrolo.el +++ b/hyrolo.el @@ -3,7 +3,7 @@ ;; Author: Bob Weiner ;; ;; Orig-Date: 7-Jun-89 at 22:08:29 -;; Last-Mod: 30-Mar-24 at 23:51:18 by Bob Weiner +;; Last-Mod: 31-Mar-24 at 11:51:46 by Bob Weiner ;; ;; SPDX-License-Identifier: GPL-3.0-or-later ;; @@ -2002,7 +2002,6 @@ Return number of matching entries found." (setq hdr-pos (cons (point-min) (point)))) (let* ((case-fold-search t) match-end) - (re-search-forward hyrolo-hdr-and-entry-regexp nil t) (while (and (or (null max-matches) (< num-found max-matches)) (funcall hyrolo-next-match-function search-pattern)) (setq match-end (point))