[Emacs-diffs] /srv/bzr/emacs/trunk r112326: * lisp/winner.el (winner-active-region): Use region-active-p, activate-mark

[Stefan Monnier]

------------------------------------------------------------
revno: 112326
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14225
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2013-04-18 09:15:08 -0400
message:
  * lisp/winner.el (winner-active-region): Use region-active-p, activate-mark
  and deactivate-mark.
  * lisp/simple.el (deactivate-mark): Don't inline it.
modified:
  lisp/ChangeLog
  lisp/simple.el
  lisp/winner.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-04-18 12:47:01 +0000
+++ b/lisp/ChangeLog    2013-04-18 13:15:08 +0000
@@ -1,3 +1,10 @@
+2013-04-18  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/tramp-sh.el (tramp-remote-process-environment): Add "TMOUT=0".

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2013-04-18 00:12:33 +0000
+++ b/lisp/simple.el    2013-04-18 13:15:08 +0000
@@ -4177,7 +4177,7 @@
       (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.

=== modified file 'lisp/winner.el'
--- a/lisp/winner.el    2013-01-01 09:11:05 +0000
+++ b/lisp/winner.el    2013-04-18 13:15:08 +0000
@@ -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))