]> git.eshelyaron.com Git - emacs.git/commitdiff
* lisp/isearch.el: Don't display "Pending" for lax and toggle commands.
authorJuri Linkov <juri@linkov.net>
Sun, 19 Dec 2021 17:47:36 +0000 (19:47 +0200)
committerJuri Linkov <juri@linkov.net>
Sun, 19 Dec 2021 17:47:36 +0000 (19:47 +0200)
* 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

index 8815cb4f2d6415689b8a6755c33b62336a786845..9e144ac27296fe29763793c6041260bdd355ce2b 100644 (file)
@@ -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))))