[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 151b202: Don't set isearch-success in isearch-wrap functions
From: |
Juri Linkov |
Subject: |
master 151b202: Don't set isearch-success in isearch-wrap functions |
Date: |
Wed, 7 Apr 2021 12:47:29 -0400 (EDT) |
branch: master
commit 151b202cf0b5ad3dd28941dcf60c20e5e2adab67
Author: Juri Linkov <juri@linkov.net>
Commit: Juri Linkov <juri@linkov.net>
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)).
---
lisp/comint.el | 1 -
lisp/isearch.el | 2 --
lisp/simple.el | 1 -
3 files changed, 4 deletions(-)
diff --git a/lisp/comint.el b/lisp/comint.el
index 4f13ff3..9cbcfc0 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 a828c56..4b4f44b 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 c48e644..999755a 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 ()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 151b202: Don't set isearch-success in isearch-wrap functions,
Juri Linkov <=