Merge from origin/emacs-24

[gnu-emacs] / lisp / emulation / cua-gmrk.el

diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el
index 761a3d5ec24ed9ed2ff71ebf1e81cdb81447da76..79fdd65efdaca219884b7b5d54da61f4c5e88ba6 100644 (file)
--- a/lisp/emulation/cua-gmrk.el
+++ b/lisp/emulation/cua-gmrk.el
@@ -1,7 +1,6 @@
 ;;; cua-gmrk.el --- CUA unified global mark support
 
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2015 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard emulations convenience cua mark
@@ -26,10 +25,8 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cua-base)
-  (require 'cua-rect)
-  )
+(require 'cua-base)
+(require 'cua-rect)
 
 ;;; Global Marker
 
@@ -95,7 +92,7 @@ insert the deleted or copied text before the global marker, even when the
 global marker is in another buffer.
 If the global marker isn't set, set the global marker at point in the current
 buffer.  Otherwise jump to the global marker position and cancel it.
-With prefix argument, don't jump to global mark when cancelling it."
+With prefix argument, don't jump to global mark when canceling it."
   (interactive "P")
   (unless cua--global-mark-initialized
     (cua--init-global-mark))
@@ -324,7 +321,7 @@ With prefix argument, don't jump to global mark when cancelling 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)))
@@ -365,7 +362,6 @@ With prefix argument, don't jump to global mark when cancelling it."
   (define-key cua--global-mark-keymap [remap backward-delete-char]     'cua-delete-backward-char-at-global-mark)
   (define-key cua--global-mark-keymap [remap backward-delete-char-untabify] 'cua-delete-backward-char-at-global-mark)
   (define-key cua--global-mark-keymap [remap self-insert-command]      'cua-insert-char-at-global-mark)
-  (define-key cua--global-mark-keymap [remap self-insert-iso]          'cua-insert-char-at-global-mark)
 
   ;; Catch self-inserting characters which are "stolen" by other modes
   (define-key cua--global-mark-keymap [t]
@@ -381,5 +377,4 @@ With prefix argument, don't jump to global mark when cancelling it."
 
 (provide 'cua-gmrk)
 
-;; arch-tag: 553d8076-a91d-48ae-825d-6cb962a5f67f
 ;;; cua-gmrk.el ends here