# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 737593797 0
# Node ID 086fda6b2041329c51c7f889dca0b061d4742c6f
# Parent  cd90d49526ae74d31390bc686f2e35e05697da19
(push-mark): Always activate the mark if not in Transient Mark mode.

diff -r cd90d49526ae -r 086fda6b2041 lisp/simple.el
--- a/lisp/simple.el	Sun May 16 22:58:52 1993 +0000
+++ b/lisp/simple.el	Sun May 16 23:09:57 1993 +0000
@@ -1262,7 +1262,7 @@
 (defun push-mark (&optional location nomsg activate)
   "Set mark at LOCATION (point, by default) and push old mark on mark ring.
 Display `Mark set' unless the optional second arg NOMSG is non-nil.
-Activate the mark if optional third arg ACTIVATE is non-nil.
+In Transient Mark mode, activate mark if optional third arg ACTIVATE non-nil.
 
 Novice Emacs Lisp programmers often try to use the mark for the wrong
 purposes.  See the documentation of `set-mark' for more information.
@@ -1278,7 +1278,8 @@
   (set-marker (mark-marker) (or location (point)) (current-buffer))
   (or nomsg executing-macro (> (minibuffer-depth) 0)
       (message "Mark set"))
-  (if activate (set-mark (mark t)))
+  (if (or activate (not transient-mark-mode))
+      (set-mark (mark t)))
   nil)
 
 (defun pop-mark ()