aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1993-05-16 23:09:57 +0000
committerRichard M. Stallman1993-05-16 23:09:57 +0000
commit8cdc660f671bea4dfac5303503d2adbb4ed69a69 (patch)
tree3babd5cc2f36b74c31e78d6618483dd634494764
parentb027f415cd547b2bf42974536e567e806ee2ce98 (diff)
downloademacs-8cdc660f671bea4dfac5303503d2adbb4ed69a69.tar.gz
emacs-8cdc660f671bea4dfac5303503d2adbb4ed69a69.zip
(push-mark): Always activate the mark if not in Transient Mark mode.
-rw-r--r--lisp/simple.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index da522aca3ea..3b2f28b6e33 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1262,7 +1262,7 @@ purposes. See the documentation of `set-mark' for more information."
1262(defun push-mark (&optional location nomsg activate) 1262(defun push-mark (&optional location nomsg activate)
1263 "Set mark at LOCATION (point, by default) and push old mark on mark ring. 1263 "Set mark at LOCATION (point, by default) and push old mark on mark ring.
1264Display `Mark set' unless the optional second arg NOMSG is non-nil. 1264Display `Mark set' unless the optional second arg NOMSG is non-nil.
1265Activate the mark if optional third arg ACTIVATE is non-nil. 1265In Transient Mark mode, activate mark if optional third arg ACTIVATE non-nil.
1266 1266
1267Novice Emacs Lisp programmers often try to use the mark for the wrong 1267Novice Emacs Lisp programmers often try to use the mark for the wrong
1268purposes. See the documentation of `set-mark' for more information. 1268purposes. See the documentation of `set-mark' for more information.
@@ -1278,7 +1278,8 @@ In Transient Mark mode, this does not activate the mark."
1278 (set-marker (mark-marker) (or location (point)) (current-buffer)) 1278 (set-marker (mark-marker) (or location (point)) (current-buffer))
1279 (or nomsg executing-macro (> (minibuffer-depth) 0) 1279 (or nomsg executing-macro (> (minibuffer-depth) 0)
1280 (message "Mark set")) 1280 (message "Mark set"))
1281 (if activate (set-mark (mark t))) 1281 (if (or activate (not transient-mark-mode))
1282 (set-mark (mark t)))
1282 nil) 1283 nil)
1283 1284
1284(defun pop-mark () 1285(defun pop-mark ()