X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/3e93bafb95608467e438ba7f725fd1f020669f8c..0fac75fed1c7d61858bef15e951bf9a0835d5bac:/lisp/emulation/cua-gmrk.el diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el index b77b2105f6..8e023783f3 100644 --- a/lisp/emulation/cua-gmrk.el +++ b/lisp/emulation/cua-gmrk.el @@ -1,6 +1,6 @@ ;;; cua-gmrk.el --- CUA unified global mark support -;; Copyright (C) 1997-2014 Free Software Foundation, Inc. +;; Copyright (C) 1997-2016 Free Software Foundation, Inc. ;; Author: Kim F. Storm ;; Keywords: keyboard emulations convenience cua mark @@ -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)))