diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emulation/cua-base.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 56c1de07fbe..d83f5e11cc7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index bc64608a284..9b754c49ee7 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -1438,6 +1438,7 @@ If ARG is the atom `-', scroll upward by nearly full screen." (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 @@ If ARG is the atom `-', scroll upward by nearly full screen." (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) |