comparison lisp/simple.el @ 90851:31beec9ee600

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 751-770) - Update from CVS - Merge from emacs--rel--22 - Update from CVS: lisp/textmodes/sgml-mode.el: Revert last change. - Merge from gnus--rel--5.10 * emacs--rel--22 (patch 18-25) * gnus--rel--5.10 (patch 222-223) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-208
author Miles Bader <miles@gnu.org>
date Thu, 24 May 2007 21:31:10 +0000
parents e6fdae9180d4 ad5cb9373c74
children 988f1edc9674
comparison
equal deleted inserted replaced
90850:7d184cd91770 90851:31beec9ee600
3202 That means that C-u \\[set-mark-command] \\[set-mark-command] 3202 That means that C-u \\[set-mark-command] \\[set-mark-command]
3203 will pop the mark twice, and 3203 will pop the mark twice, and
3204 C-u \\[set-mark-command] \\[set-mark-command] \\[set-mark-command] 3204 C-u \\[set-mark-command] \\[set-mark-command] \\[set-mark-command]
3205 will pop the mark three times. 3205 will pop the mark three times.
3206 3206
3207 nil means \\[set-mark-command]'s behavior does not change 3207 A value of nil means \\[set-mark-command]'s behavior does not change
3208 after C-u \\[set-mark-command]." 3208 after C-u \\[set-mark-command]."
3209 :type 'boolean 3209 :type 'boolean
3210 :group 'editing-basics) 3210 :group 'editing-basics)
3211 3211
3212 (defun set-mark-command (arg) 3212 (defun set-mark-command (arg)
3269 (defun push-mark (&optional location nomsg activate) 3269 (defun push-mark (&optional location nomsg activate)
3270 "Set mark at LOCATION (point, by default) and push old mark on mark ring. 3270 "Set mark at LOCATION (point, by default) and push old mark on mark ring.
3271 If the last global mark pushed was not in the current buffer, 3271 If the last global mark pushed was not in the current buffer,
3272 also push LOCATION on the global mark ring. 3272 also push LOCATION on the global mark ring.
3273 Display `Mark set' unless the optional second arg NOMSG is non-nil. 3273 Display `Mark set' unless the optional second arg NOMSG is non-nil.
3274 In Transient Mark mode, activate mark if optional third arg ACTIVATE non-nil.
3275 3274
3276 Novice Emacs Lisp programmers often try to use the mark for the wrong 3275 Novice Emacs Lisp programmers often try to use the mark for the wrong
3277 purposes. See the documentation of `set-mark' for more information. 3276 purposes. See the documentation of `set-mark' for more information.
3278 3277
3279 In Transient Mark mode, this does not activate the mark." 3278 In 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)
3283 (move-marker (car (nthcdr mark-ring-max mark-ring)) nil) 3282 (move-marker (car (nthcdr mark-ring-max mark-ring)) nil)
3284 (setcdr (nthcdr (1- mark-ring-max) mark-ring) nil))) 3283 (setcdr (nthcdr (1- mark-ring-max) mark-ring) nil)))