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

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

Fixes: debbugs:14225

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2423acc56671c2382622e8f1e96d0e13059c2448..98ba110ab3311056d8e49104ea24b1b2a6210241 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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".

diff --git a/lisp/simple.el b/lisp/simple.el
index 3f28b8413e06098b7f3545d0e839e9d7d0394776..5fda90210049620486b0fa2ad4bbaa562d88d053 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -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.

diff --git a/lisp/winner.el b/lisp/winner.el
index dfbd15b6676695ace88569f0c86ad1931eab4014..f521ba0521b56b6b1aa759c367287542b2c82d2d 100644 (file)
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -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))