mlf176f2 pushed a commit to branch externals/ergoemacs-mode in repository elpa.
commit 4ec6271f772f71f2e548a300760b988bbd101d26 Author: Matthew L. Fidler <[email protected]> Date: Thu Jun 26 08:52:45 2014 -0500 Make undo-tree the default undo method and installed when ergoemacs-mode is installed. Issue #242 --- ergoemacs-functions.el | 4 ++-- ergoemacs-mode.el | 2 +- ergoemacs-themes.el | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el index e8bbd42..6a84511 100644 --- a/ergoemacs-functions.el +++ b/ergoemacs-functions.el @@ -1327,10 +1327,10 @@ Installs `undo-tree' if not present." (interactive "*P") (require 'undo-tree nil t) (cond - ((fboundp 'undo-tree-redo) - (call-interactively 'undo-tree-redo)) ((fboundp 'redo) (call-interactively 'redo)) + ((fboundp 'undo-tree-redo) + (call-interactively 'undo-tree-redo)) (t (if (not (yes-or-no-p "Redo command not found, install undo-tree for redo?")) (error "Redo not found, need undo-tree or redo commands present.") diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el index 0b48376..109f3c3 100644 --- a/ergoemacs-mode.el +++ b/ergoemacs-mode.el @@ -9,7 +9,7 @@ ;; Created: August 01 2007 ;; Keywords: convenience ;; Version: 0 -;; Package-Requires: ((emacs "24.1")) +;; Package-Requires: ((emacs "24.1") (undo-tree "0.6.5")) ;; URL: https://github.com/ergoemacs/ergoemacs-mode ;; ErgoEmacs is free software: you can redistribute it and/or modify diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el index c1782c2..bc0d2e7 100644 --- a/ergoemacs-themes.el +++ b/ergoemacs-themes.el @@ -107,7 +107,7 @@ (global-set-key (kbd "<M-backspace>") '(undo-tree-undo undo)) (global-set-key (kbd "C-z") 'undo) - (global-set-key (kbd "C-S-z") '(undo-tree-redo redo ergoemacs-redo)) + (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) (global-set-key (kbd "C-c") 'ergoemacs-ctl-c) @@ -197,7 +197,7 @@ (global-set-key (kbd "C-x <timeout>") 'ergoemacs-cut-line-or-region) (global-set-key (kbd "C-x C-b") 'ibuffer) (global-set-key (kbd "C-x") 'ergoemacs-ctl-x "Cut") - (global-set-key (kbd "C-y") '(undo-tree-redo redo ergoemacs-redo) "↷ redo") + (global-set-key (kbd "C-y") '(redo undo-tree-redo ergoemacs-redo) "↷ redo") (global-set-key (kbd "M-S-<next>") 'forward-page) (global-set-key (kbd "M-S-<prior>") 'backward-page) @@ -267,12 +267,12 @@ (global-set-key (kbd "<C-f2>") 'ergoemacs-cut-all) (global-set-key (kbd "<C-f3>") 'ergoemacs-copy-all) (global-set-key (kbd "<C-f4>") 'ergoemacs-paste-cycle) - (global-set-key (kbd "<C-f5>") '(undo-tree-redo redo ergoemacs-redo)) + (global-set-key (kbd "<C-f5>") '(redo undo-tree-redo ergoemacs-redo)) (global-set-key (kbd "<C-f8>") 'highlight-symbol-prev) (global-set-key (kbd "<C-f9>") 'highlight-symbol-next) (global-set-key (kbd "<M-f2>") 'ergoemacs-cut-all) (global-set-key (kbd "<M-f3>") 'ergoemacs-copy-all) - (global-set-key (kbd "<M-f5>") '(undo-tree-redo redo ergoemacs-redo)) + (global-set-key (kbd "<M-f5>") '(redo undo-tree-redo ergoemacs-redo)) (global-set-key (kbd "<S-f3>") 'ergoemacs-toggle-letter-case) (global-set-key (kbd "<f11>") 'previous-line) (global-set-key (kbd "<f12>") 'next-line) @@ -515,7 +515,7 @@ (global-set-key (kbd "M-C") 'ergoemacs-copy-all) (global-set-key (kbd "M-X") 'ergoemacs-cut-all) - (global-set-key (kbd "M-Z") '(undo-tree-redo redo ergoemacs-redo)) + (global-set-key (kbd "M-Z") '(redo undo-tree-redo ergoemacs-redo)) ;; Undo (global-set-key (kbd "C-_") nil) @@ -529,8 +529,8 @@ (global-set-key (kbd "C-x <timeout>") 'ergoemacs-cut-line-or-region) (global-set-key (kbd "C-x") 'ergoemacs-ctl-x) (global-set-key (kbd "C-z") 'undo) - (global-set-key (kbd "C-S-z") '(undo-tree-redo redo ergoemacs-redo)) - (global-set-key (kbd "C-y") '(undo-tree-redo redo ergoemacs-redo)) + (global-set-key (kbd "C-S-z") '(redo undo-tree-redo ergoemacs-redo)) + (global-set-key (kbd "C-y") '(redo undo-tree-redo ergoemacs-redo)) ;; Mode specific changes (when isearch-mode-hook @@ -706,7 +706,7 @@ (global-set-key (kbd "<apps> x") 'ergoemacs-cut-line-or-region) (global-set-key (kbd "<apps> c") 'ergoemacs-copy-line-or-region) (global-set-key (kbd "<apps> v") 'ergoemacs-paste) - (global-set-key (kbd "<apps> b") '(undo-tree-redo redo ergoemacs-redo)) + (global-set-key (kbd "<apps> b") '(redo undo-tree-redo ergoemacs-redo)) (global-set-key (kbd "<apps> t") 'switch-to-buffer) (global-set-key (kbd "<apps> z") 'undo) (global-set-key (kbd "<apps> r") goto-map))
