branch: scratch/mheerdegen-preview
commit 562b2dbee8f88d8a1f678d2511242e2a84364795
Author: Michael Heerdegen <[email protected]>
Commit: Michael Heerdegen <[email protected]>
WIP [el-search] Fix search setup when occur flag bound
---
packages/el-search/el-search.el | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el
index d518d1a..f60879b 100644
--- a/packages/el-search/el-search.el
+++ b/packages/el-search/el-search.el
@@ -2033,14 +2033,16 @@ any case."
(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.
