procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/winner.el (winner-active-region): Use region-active-p, activate-mark

Browse source 
and deactivate-mark.
* lisp/simple.el (deactivate-mark): Don't inline it.

Fixes: debbugs:14225
This commit is contained in:
Stefan Monnier 2013-04-18 09:15:08 -04:00
parent beb42340a1
commit cdca825560
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2013-04-18 Stefan Monnier <monnier@iro.umontreal.ca>
* winner.el (winner-active-region): Use region-active-p, activate-mark
and deactivate-mark (bug#14225).
* simple.el (deactivate-mark): Don't inline it.
2013-04-18 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-sh.el (tramp-remote-process-environment): Add "TMOUT=0".

2
lisp/simple.el
View file

@ -4177,7 +4177,7 @@ a mistake; see the documentation of `set-mark'."
(marker-position (mark-marker))
(signal 'mark-inactive nil)))
(defsubst deactivate-mark (&optional force)
(defun deactivate-mark (&optional force)
"Deactivate the mark.
If Transient Mark mode is disabled, this function normally does
nothing; but if FORCE is non-nil, it deactivates the mark anyway.

6
lisp/winner.el
View file

@ -45,10 +45,8 @@
(if (featurep 'xemacs)
`(if ,store (zmacs-activate-region)
(zmacs-deactivate-region))
`(setq mark-active ,store)))))
(if (boundp 'mark-active)
mark-active
(region-active-p)))
`(if ,store (activate-mark) (deactivate-mark))))))
(region-active-p))
(defalias 'winner-edges
(if (featurep 'xemacs) 'window-pixel-edges 'window-edges))