mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

(activate-mark): New function.

Browse source 
(set-mark-command): Use it with region-active-p to clean up the code.
(exchange-point-and-mark): Invert the meaning of C-u when
transient-mark-mode is active.
This commit is contained in:
Stefan Monnier 2008-03-26 03:40:40 +00:00
parent 04509548fd
commit 2977fc373a
2 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

44
lisp/simple.el
View file

@ -3347,6 +3347,13 @@ Also runs the hook `deactivate-mark-hook'."
(setq mark-active nil)
(run-hooks 'deactivate-mark-hook))))
(defun activate-mark ()
"Activate the mark."
(when (mark t)
(setq mark-active t)
(unless transient-mark-mode
(setq transient-mark-mode 'lambda))))
(defcustom select-active-regions nil
"If non-nil, an active region automatically becomes the window selection."
:type 'boolean
@ -3520,13 +3527,13 @@ purposes. See the documentation of `set-mark' for more information."
(arg
(setq this-command 'pop-to-mark-command)
(pop-to-mark-command))
((and (eq last-command 'set-mark-command)
mark-active (null transient-mark-mode))
(setq transient-mark-mode 'lambda)
(message "Transient-mark-mode temporarily enabled"))
((and (eq last-command 'set-mark-command)
transient-mark-mode)
(deactivate-mark))
((eq last-command 'set-mark-command)
(if (region-active-p)
(progn
(deactivate-mark)
(message "Mark deactivated"))
(activate-mark)
(message "Mark activated")))
(t
(push-mark-command nil))))
@ -3580,18 +3587,17 @@ This command works even when the mark is not active,
and it reactivates the mark.
With prefix arg, `transient-mark-mode' is enabled temporarily."
(interactive "P")
(if arg
(if mark-active
(if (null transient-mark-mode)
(setq transient-mark-mode 'lambda))
(setq arg nil)))
(unless arg
(let ((omark (mark t)))
(if (null omark)
(error "No mark set in this buffer"))
(set-mark (point))
(goto-char omark)
nil)))
(deactivate-mark)
(let ((omark (mark t)))
(if (null omark)
(error "No mark set in this buffer"))
(set-mark (point))
(goto-char omark)
(if (or (and arg (region-active-p)) ; (xor arg (not (region-active-p)))
(not (or arg (region-active-p))))
(deactivate-mark)
(activate-mark))
nil))
(define-minor-mode transient-mark-mode
"Toggle Transient Mark mode.