* lisp/isearch.el (isearch-search-and-update): Let-bind 'isearch-cmds'.

When 'isearch-wrap-pause' is 'no' or 'no-ding', let-bind 'isearch-cmds'
to avoid changing it by 'isearch-push-state' in 'isearch-repeat',
so that a later DEL (isearch-delete-char) doesn't stop at the
intermediate failing state (bug#68158).

(cherry picked from commit dc9d02f8a01d86ac8ff3fb004bb2f22cf211dcef)

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 6b39054b512fe43c8543203417853d5d53e318ae..4cac79a3f4a090c6a0719fcf0088cfc5d5fec8d7 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2875,7 +2875,8 @@ The command accepts Unicode names like \"smiling face\" or
       (isearch-search)
       (when (and (memq isearch-wrap-pause '(no no-ding))
                  (not isearch-success))
-        (isearch-repeat (if isearch-forward 'forward 'backward)))))
+        (let ((isearch-cmds isearch-cmds))
+          (isearch-repeat (if isearch-forward 'forward 'backward))))))
   (isearch-push-state)
   (if isearch-op-fun (funcall isearch-op-fun))
   (isearch-update))