From: Jens Schmidt <jschmidt4gnu@vodafonemail.de>
Date: Sat, 20 May 2023 21:03:29 +0000 (+0200)
Subject: Preserve mark in comint-history-isearch
X-Git-Tag: emacs-29.0.92~120
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2a5c946f879;p=emacs.git

Preserve mark in comint-history-isearch

This preserves mark in `comint-history-isearch-backward' and
friends, which tend to set the mark on completion of the isearch
to unexpected positions.
* lisp/comint.el (comint-history-isearch-end): Set `isearch-opoint'
to point.  (Bug#63616)
---

diff --git a/lisp/comint.el b/lisp/comint.el
index 682b555a33c..328b073dc8a 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1542,6 +1542,8 @@ Intended to be added to `isearch-mode-hook' in `comint-mode'."
   (setq isearch-message-function nil)
   (setq isearch-wrap-function nil)
   (setq isearch-push-state-function nil)
+  ;; Force isearch to not change mark.
+  (setq isearch-opoint (point))
   (kill-local-variable 'isearch-lazy-count)
   (remove-hook 'isearch-mode-end-hook 'comint-history-isearch-end t)
   (unless isearch-suspended