aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2007-05-18 22:56:08 +0000
committerRichard M. Stallman2007-05-18 22:56:08 +0000
commitde9606f01da32e4070bf7908ef4cf9ba835e4b6f (patch)
treefae1e87b2f6f97f5185edc2a6c01f353270ae0ec
parent64953c0a99a725ba3fb74b34b25a751cbb3cce4a (diff)
downloademacs-de9606f01da32e4070bf7908ef4cf9ba835e4b6f.tar.gz
emacs-de9606f01da32e4070bf7908ef4cf9ba835e4b6f.zip
(push-mark): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/simple.el3
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 490a740c4fc..cd6587e6d57 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-05-18 Richard Stallman <rms@gnu.org>
2
3 * simple.el (push-mark): Doc fix.
4
12007-05-18 Rob Riepel <riepel@Stanford.EDU> 52007-05-18 Rob Riepel <riepel@Stanford.EDU>
2 6
3 * emulation/tpu-edt.el (CSI-map, SS3-map) Moved from global-map to 7 * emulation/tpu-edt.el (CSI-map, SS3-map) Moved from global-map to
diff --git a/lisp/simple.el b/lisp/simple.el
index 7faa0547687..daedae6100c 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3271,12 +3271,11 @@ purposes. See the documentation of `set-mark' for more information."
3271If the last global mark pushed was not in the current buffer, 3271If the last global mark pushed was not in the current buffer,
3272also push LOCATION on the global mark ring. 3272also push LOCATION on the global mark ring.
3273Display `Mark set' unless the optional second arg NOMSG is non-nil. 3273Display `Mark set' unless the optional second arg NOMSG is non-nil.
3274In Transient Mark mode, activate mark if optional third arg ACTIVATE non-nil.
3275 3274
3276Novice Emacs Lisp programmers often try to use the mark for the wrong 3275Novice Emacs Lisp programmers often try to use the mark for the wrong
3277purposes. See the documentation of `set-mark' for more information. 3276purposes. See the documentation of `set-mark' for more information.
3278 3277
3279In Transient Mark mode, this does not activate the mark." 3278In Transient Mark mode, activate mark if optional third arg ACTIVATE non-nil."
3280 (unless (null (mark t)) 3279 (unless (null (mark t))
3281 (setq mark-ring (cons (copy-marker (mark-marker)) mark-ring)) 3280 (setq mark-ring (cons (copy-marker (mark-marker)) mark-ring))
3282 (when (> (length mark-ring) mark-ring-max) 3281 (when (> (length mark-ring) mark-ring-max)