[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/el-search f7e4c5b 327/332: [el-search] Small fix in occ
From: |
Stefan Monnier |
Subject: |
[elpa] externals/el-search f7e4c5b 327/332: [el-search] Small fix in occur filter-buffer-substring-function |
Date: |
Tue, 1 Dec 2020 15:49:15 -0500 (EST) |
branch: externals/el-search
commit f7e4c5bb2f5e2df3daa3fadd715d514c261d5258
Author: Michael Heerdegen <michael_heerdegen@web.de>
Commit: Michael Heerdegen <michael_heerdegen@web.de>
[el-search] Small fix in occur filter-buffer-substring-function
* packages/el-search/el-search.el (el-search--occur): Use dedicated
text property to mark headlines in *El Occur*.
(el-search-occur-filter-buffer-substring): Use it to check whether the
substring includes any headline instead of 'outline-regexp' based
guessing.
---
el-search.el | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/el-search.el b/el-search.el
index 6e7f891..f49e945 100644
--- a/el-search.el
+++ b/el-search.el
@@ -3524,6 +3524,7 @@ Prompt for a new pattern and revert."
(revert-buffer))
(defvar el-search-occur-match-ov-prop 'el-occur-match-data)
+(defvar el-search-occur-headline-prop 'el-search-occur-headline)
(defun el-search-occur-jump-to-match ()
(interactive)
@@ -3713,9 +3714,7 @@ When nil, all such treatment is disabled."
(defun el-search-occur-filter-buffer-substring (beg end &optional delete)
(if (or delete
(not el-search-occur-match-markers)
- (not (save-excursion
- (goto-char beg)
- (search-forward-regexp outline-regexp end t))))
+ (eq end (next-single-char-property-change beg
el-search-occur-headline-prop nil end)))
(buffer-substring--filter beg end delete)
(let ((contents '())
p)
@@ -3868,8 +3867,9 @@ addition from `special-mode-map':
(insert "\n\n;;; *** ")
(insert-button
(or file (format "%S" buffer))
- 'action (lambda (_) (el-search--occur-button-action
- (or get-buffer file buffer))))
+ 'action
+ (lambda (_) (el-search--occur-button-action (or
get-buffer file buffer)))
+ el-search-occur-headline-prop t)
(insert (format " (%d match%s)\n"
buffer-matches
(if (> buffer-matches 1) "es" "")))
- [elpa] externals/el-search 73a15d2 274/332: [el-search] Stop for problematic comments, (continued)
- [elpa] externals/el-search 73a15d2 274/332: [el-search] Stop for problematic comments, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 4961830 273/332: [el-search] Make replacement editable and ediff'able, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search da1f46b 282/332: [el-search] Make mouse clicks not abort the search, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 2a098da 293/332: [el-search] Unify go-to-previous/next-match key bindings, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search d4f8b3b 289/332: [el-search] Tweak my last commit "Add menus", Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 4d81139 299/332: [el-search] Fine tune separator for splicing replace, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 424138b 307/332: [el-search] Tweak 'display-buffer' actions, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search d9acf3a 314/332: [el-search] Fix sanity check regarding comments, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 13fc32d 323/332: [el-search] Fix a highlighting corner case, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 9e95e79 325/332: [el-search] Also overwrite replaced matches automatically, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search f7e4c5b 327/332: [el-search] Small fix in occur filter-buffer-substring-function,
Stefan Monnier <=
- [elpa] externals/el-search 82b807f 231/332: * el-search/el-search.el: New user option `el-search-allow-scroll', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 3218858 261/332: [el-search] Add some key bindings, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search db7ccbb 220/332: * el-search/el-search.el: Don't highlight inserted replacement, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 226296a 229/332: * el-search/el-search-x.el: New pattern type `string-lines', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 3503cf0 280/332: [el-search] Fix search setup with non-nil occur flag, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 1a46fca 291/332: [el-search] Allow expressions as args of 'string', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 2f7770a 311/332: [el-search] Label matches when copying from *El-Occur*, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 07bed84 330/332: [el-search] Fix eldoc support for uncompiled patterns, Stefan Monnier, 2020/12/01