[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/el-search 3503cf0 280/332: [el-search] Fix search setup
From: |
Stefan Monnier |
Subject: |
[elpa] externals/el-search 3503cf0 280/332: [el-search] Fix search setup with non-nil occur flag |
Date: |
Tue, 1 Dec 2020 15:49:04 -0500 (EST) |
branch: externals/el-search
commit 3503cf08e333970c9aac8fabf2af4a68ee01179a
Author: Michael Heerdegen <michael_heerdegen@web.de>
Commit: Michael Heerdegen <michael_heerdegen@web.de>
[el-search] Fix search setup with non-nil occur flag
Also bump version to 1.8.6.
* packages/el-search/el-search.el (el-search-setup-search-1): Skip
parts of setup when 'el-search-occur-flag' is non-nil.
---
el-search.el | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/el-search.el b/el-search.el
index 55b7a53..1edb198 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.8.5
+;; Version: 1.8.6
;; Package-Requires: ((emacs "25") (stream "2.2.4") (cl-print "1.0"))
@@ -1854,14 +1854,16 @@ Go back to the place where the search had been started."
(setq el-search-use-transient-map t))
(defun el-search-setup-search-1 (pattern get-buffer-stream &optional
from-here setup-function)
- (el-search--set-search-origin-maybe)
- (setq el-search--success nil)
+ (unless el-search-occur-flag
+ (el-search--set-search-origin-maybe)
+ (setq el-search--success nil))
(setq el-search--current-search
(el-search-make-search pattern get-buffer-stream))
(when setup-function (funcall setup-function el-search--current-search))
(ring-insert el-search-history el-search--current-search)
(when from-here (setq el-search--temp-buffer-flag nil))
- (el-search-prefix-key-maybe-set-transient-map))
+ (unless el-search-occur-flag
+ (el-search-prefix-key-maybe-set-transient-map)))
(defun el-search-setup-search (pattern get-buffer-stream &optional
setup-function from-here)
"Create and start a new el-search.
- [elpa] externals/el-search 4d81139 299/332: [el-search] Fine tune separator for splicing replace, (continued)
- [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, 2020/12/01
- [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 <=
- [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