summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuri Linkov <juri@linkov.net>2021-04-07 19:47:09 +0300
committerJuri Linkov <juri@linkov.net>2021-04-07 19:47:09 +0300
commit151b202cf0b5ad3dd28941dcf60c20e5e2adab67 (patch)
treecd6abe0c5accd0aacb5c9ad2e49361582caa9c4d
parent67628c9b2bc2b2f3e3fca2bf3e1e7357f38a2dd5 (diff)
downloademacs-151b202cf0b5ad3dd28941dcf60c20e5e2adab67.tar.gz
Don't set isearch-success in isearch-wrap functions
* lisp/comint.el (comint-history-isearch-wrap): * lisp/simple.el (minibuffer-history-isearch-wrap): Don't set isearch-success to t, so isearch-repeat won't skip the beginning of the wrapped match with (forward-char (if isearch-forward 1 -1)).
-rw-r--r--lisp/comint.el1
-rw-r--r--lisp/isearch.el2
-rw-r--r--lisp/simple.el1
3 files changed, 0 insertions, 4 deletions
diff --git a/lisp/comint.el b/lisp/comint.el
index 4f13ff31acb..9cbcfc03fa6 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1627,7 +1627,6 @@ or to the last history element for a backward search."
(if isearch-forward
(comint-goto-input (1- (ring-length comint-input-ring)))
(comint-goto-input nil))
- (setq isearch-success t)
(goto-char (if isearch-forward (comint-line-beginning-position) (point-max))))
(defun comint-history-isearch-push-state ()
diff --git a/lisp/isearch.el b/lisp/isearch.el
index a828c569aac..4b4f44bdffd 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1887,8 +1887,6 @@ Use `isearch-exit' to quit without signaling."
(setq count (1+ count)) ;; Increment to force repeat
(setq isearch-wrapped t)
(if isearch-wrap-function
- ;; Note that some wrap functions change the value of
- ;; isearch-success, so it's handled above before this call.
(funcall isearch-wrap-function)
(goto-char (if isearch-forward (point-min) (point-max)))))))
;; Stop looping on failure
diff --git a/lisp/simple.el b/lisp/simple.el
index c48e644345b..999755a642f 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2798,7 +2798,6 @@ or to the last history element for a backward search."
(if isearch-forward
(goto-history-element (length (minibuffer-history-value)))
(goto-history-element 0))
- (setq isearch-success t)
(goto-char (if isearch-forward (minibuffer-prompt-end) (point-max))))
(defun minibuffer-history-isearch-push-state ()