* lisp/emulation/cua-base.el (cua--select-keymaps): Use region-active-p.

(cua-set-mark, cua--pre-command-handler-1,cua--post-command-handler-1):
* lisp/emulation/cua-gmrk.el (cua-cancel-global-mark): Same.

Fixes: debbugs:18952

3 files changed, 12 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7c7683a5f82..a41e298ecbc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emulation/cua-base.el (cua--select-keymaps): Use region-active-p
+        (bug#18952).
+        (cua-set-mark, cua--pre-command-handler-1,cua--post-command-handler-1):
+        * emulation/cua-gmrk.el (cua-cancel-global-mark): Same.
+
 2014-11-07  Michael Albinus  <michael.albinus@gmx.de>
 
         * files.el (file-name-non-special): Wrap the call of
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 2f321f74b97..a378f672386 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1015,7 +1015,7 @@ With a double \\[universal-argument] prefix argument, unconditionally set mark."
     (or (and cua-auto-mark-last-change
              (cua-pop-to-last-change))
         (pop-to-mark-command)))
-   ((and cua-toggle-set-mark mark-active)
+   ((and cua-toggle-set-mark (region-active-p))
     (cua--deactivate)
     (message "Mark cleared"))
    (t
@@ -1114,7 +1114,7 @@ If ARG is the atom `-', scroll upward by nearly full screen."
 
    ;; Set mark if user explicitly said to do so
    (cua--rectangle ;FIXME: ??
-    (unless mark-active
+    (unless (region-active-p)
       (push-mark-command nil nil))))
 
   ;; Detect extension of rectangles by mouse or other movement
@@ -1140,7 +1140,7 @@ If ARG is the atom `-', scroll upward by nearly full screen."
   (if cua--debug
       (cond
        (cua--rectangle (cua--rectangle-assert))
-       (mark-active (message "Mark=%d Point=%d" (mark t) (point)))))
+       ((region-active-p) (message "Mark=%d Point=%d" (mark t) (point)))))
 
   (if cua-enable-cursor-indications
       (cua--update-indications))
@@ -1199,7 +1199,7 @@ If ARG is the atom `-', scroll upward by nearly full screen."
 (defun cua--select-keymaps ()
   ;; Setup conditions for selecting the proper keymaps in cua--keymap-alist.
   (setq cua--ena-region-keymap
-        (and mark-active (not deactivate-mark)))
+        (and (region-active-p) (not deactivate-mark)))
   (setq cua--ena-prefix-override-keymap
         (and cua--ena-region-keymap
              cua-enable-cua-keys
diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el
index b77b2105f64..3d6c9d62a26 100644
--- a/lisp/emulation/cua-gmrk.el
+++ b/lisp/emulation/cua-gmrk.el
@@ -321,7 +321,7 @@ With prefix argument, don't jump to global mark when canceling it."
 (defun cua-cancel-global-mark ()
   "Cancel the global mark."
   (interactive)
-  (if mark-active
+  (if (region-active-p)
       (cua-cancel)
     (if (cua--global-mark-active)
         (cua--deactivate-global-mark t)))