Fix "C-SPC C-SPC" after "C-x C-x"

* lisp/simple.el (exchange-point-and-mark): Fix what the command
does when 'transient-mark-mode' is OFF.  (Bug#52896)

(cherry picked from commit 19c6cad1821eb896b2ddd0f6eab030f0880ea254)

diff --git a/lisp/simple.el b/lisp/simple.el
index 9c17f0ea6d3ceff0259000337cf3c690aab54a60..2822a4a3c23d3d6030623fa09708f82aecbb5f6e 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -6652,7 +6652,7 @@ mode temporarily."
         (user-error "No mark set in this buffer"))
     (set-mark (point))
     (goto-char omark)
-    (cond (temp-highlight
+    (cond ((and (not arg) (not temp-highlight))
           (setq-local transient-mark-mode (cons 'only transient-mark-mode)))
          ((xor arg (not (region-active-p)))
           (deactivate-mark))