[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 434c2cb: * lisp/isearch.el: Don't display "Pending" for lax and t
From: |
Juri Linkov |
Subject: |
master 434c2cb: * lisp/isearch.el: Don't display "Pending" for lax and toggle commands. |
Date: |
Sun, 19 Dec 2021 12:48:10 -0500 (EST) |
branch: master
commit 434c2cb2e9ac7705ee67a0a2493c29b1cbbcfa39
Author: Juri Linkov <juri@linkov.net>
Commit: Juri Linkov <juri@linkov.net>
* lisp/isearch.el: Don't display "Pending" for lax and toggle commands.
* lisp/isearch.el (isearch-message-prefix): Display "Pending"
only when isearch-adjusted is 't' (bug#52356).
(isearch-define-mode-toggle):
Set isearch-adjusted to 'toggle' instead of 't'.
(isearch-search-fun-default):
Set isearch-adjusted to 'lax' instead of 't'.
---
lisp/isearch.el | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 8815cb4..9e144ac 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2063,7 +2063,7 @@ The command then executes BODY and updates the isearch
prompt."
#',function))
(setq isearch-regexp nil)))
,@body
- (setq isearch-success t isearch-adjusted t)
+ (setq isearch-success t isearch-adjusted 'toggle)
(isearch-update))
(define-key isearch-mode-map ,key #',command-name)
,@(when (and function (symbolp function))
@@ -3417,7 +3417,7 @@ the word mode."
;; If currently failing, display no ellipsis.
(or isearch-success (setq ellipsis nil))
(let ((m (concat (if isearch-success "" "failing ")
- (if isearch-adjusted "pending " "")
+ (if (eq isearch-adjusted t) "pending " "")
(if (and isearch-wrapped
(not isearch-wrap-function)
(if isearch-forward
@@ -3521,10 +3521,10 @@ Can be changed via `isearch-search-fun-function' for
special needs."
;; (Bug#35802).
(regexp
(cond (isearch-regexp-function
- (let ((lax (and (not bound)
+ (let ((lax (and (not bound) ; not lazy-highlight
(isearch--lax-regexp-function-p))))
(when lax
- (setq isearch-adjusted t))
+ (setq isearch-adjusted 'lax))
(if (functionp isearch-regexp-function)
(funcall isearch-regexp-function string lax)
(word-search-regexp string lax))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 434c2cb: * lisp/isearch.el: Don't display "Pending" for lax and toggle commands.,
Juri Linkov <=