[elpa] 226/287: Remove default redo keys; Possibly Fix Issue #242

[Matthew Fidler]

mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.

commit bc0a890c1b5e12129d9f3400a98129689bd14e57
Author: Matthew L. Fidler <address@hidden>
Date:   Thu Jun 26 09:29:14 2014 -0500

    Remove default redo keys; Possibly Fix Issue #242
---
 ergoemacs-mode.el   |    3 +--
 ergoemacs-themes.el |    6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 109f3c3..1d50418 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -66,8 +66,7 @@
 ;; FIXME: Use cl-lib when available.
 ;;(require 'cl)
 (require 'easymenu)
-(require 'cua-base)
-(require 'cua-rect)
+(require 'undo-tree nil t)
 
 (defvar ergoemacs-debug ""
   "Debugging for `ergoemacs-mode'.")
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index bc0d2e7..73c1589 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -107,6 +107,12 @@
   (global-set-key (kbd "<M-backspace>") '(undo-tree-undo undo))
   (global-set-key (kbd "C-z") 'undo)
 
+  ;; Take out undo-tree's redo bindings
+  (when ergoemacs-theme-hook
+    :modify-map t
+    (define-key undo-tree-map (kbd "C-?") nil) 
+    (define-key undo-tree-map (kbd "M-_") nil))
+  
   (global-set-key (kbd "C-S-z") '(redo undo-tree-redo ergoemacs-redo))
   (global-set-key (kbd "<S-delete>") 'ergoemacs-cut-line-or-region)
   (global-set-key (kbd "C-c <timeout>") 'ergoemacs-copy-line-or-region)