From: Juri Linkov <juri@linkov.net>
Date: Mon, 12 Oct 2020 19:56:35 +0000 (+0300)
Subject: * lisp/isearch.el (isearch-search): Set isearch-match-data in the right place.
X-Git-Tag: emacs-28.0.90~5664
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f2fb69f08ed7783406639de09747529c24416983;p=emacs.git

* lisp/isearch.el (isearch-search): Set isearch-match-data in the right place.
---

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 1efd9b21304..0879f948cff 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -3451,10 +3451,10 @@ Optional third argument, if t, means if fail just return nil (no error).
 			   (match-beginning 0) (match-end 0)))
 	      (setq retry nil)))
 	(setq isearch-just-started nil)
-	(setq isearch-match-data (match-data t))
-	(if isearch-success
-	    (setq isearch-other-end
-		  (if isearch-forward (match-beginning 0) (match-end 0)))))
+	(when isearch-success
+	  (setq isearch-other-end
+		(if isearch-forward (match-beginning 0) (match-end 0)))
+          (setq isearch-match-data (match-data t))))
 
     (quit (isearch-unread ?\C-g)
 	  (setq isearch-success nil))