# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1295017577 -3600
# Node ID 07e52ed69b5d5b427943e90ef507ac90921c8a5a
# Parent  b47167f02517b98a3adc44841843da71ebb8b21f
* emulation/cua-base.el (cua--init-keymaps):
Remap exchange-point-and-mark in cua-global-keymap.

diff -r b47167f02517 -r 07e52ed69b5d lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jan 14 13:17:24 2011 +0100
+++ b/lisp/ChangeLog	Fri Jan 14 16:06:17 2011 +0100
@@ -1,3 +1,8 @@
+2011-01-14  Kim F. Storm  <storm@cua.dk>
+
+	* emulation/cua-base.el (cua--init-keymaps):
+	Remap exchange-point-and-mark in cua-global-keymap.
+
 2011-01-14  Tassilo Horn  <tassilo@member.fsf.org>
 
 	* progmodes/sh-script.el (sh-other-keywords): Add ZSH's foreach
diff -r b47167f02517 -r 07e52ed69b5d lisp/emulation/cua-base.el
--- a/lisp/emulation/cua-base.el	Fri Jan 14 13:17:24 2011 +0100
+++ b/lisp/emulation/cua-base.el	Fri Jan 14 16:06:17 2011 +0100
@@ -1438,6 +1438,7 @@
   (define-key cua-global-keymap [remap yank-pop]		'cua-paste-pop)
   ;; set mark
   (define-key cua-global-keymap [remap set-mark-command]	'cua-set-mark)
+  (define-key cua-global-keymap [remap exchange-point-and-mark] 'cua-exchange-point-and-mark)
 
   ;; scrolling
   (define-key cua-global-keymap [remap scroll-up]	'cua-scroll-up)
@@ -1452,7 +1453,6 @@
   (when cua-remap-control-v
     (define-key cua--cua-keys-keymap [(control v)] 'yank)
     (define-key cua--cua-keys-keymap [(meta v)] 'cua-repeat-replace-region))
-  (define-key cua--cua-keys-keymap [remap exchange-point-and-mark] 'cua-exchange-point-and-mark)
 
   (define-key cua--prefix-override-keymap [(control x)] 'cua--prefix-override-handler)
   (define-key cua--prefix-override-keymap [(control c)] 'cua--prefix-override-handler)