From 23f4e533d90be9f7705caa378f1b66edc8dcb9f6 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Thu, 4 Oct 2012 11:21:36 -1000
Subject: [PATCH] Move undo and redo in "core:"

---
 src/app/editor.coffee         | 4 ++--
 src/app/keymaps/atom.coffee   | 2 ++
 src/app/keymaps/editor.coffee | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 7b9676bd9..97fd9e68b 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -108,8 +108,8 @@ class Editor extends View
       'core:select-all': @selectAll
       'core:backspace': @backspace
       'core:delete': @delete
-      'undo': @undo
-      'redo': @redo
+      'core:undo': @undo
+      'core:redo': @redo
       'cut': @cutSelection
       'copy': @copySelection
       'paste': @paste
diff --git a/src/app/keymaps/atom.coffee b/src/app/keymaps/atom.coffee
index 63d847286..1bf4a4844 100644
--- a/src/app/keymaps/atom.coffee
+++ b/src/app/keymaps/atom.coffee
@@ -13,6 +13,8 @@ window.keymap.bindKeys 'body'
   'backspace': 'core:backspace'
   'shift-backspace': 'core:backspace'
   'delete': 'core:delete'
+  'meta-z': 'core:undo'
+  'meta-Z': 'core:redo'
   pageup: 'core:page-up'
   pagedown: 'core:page-down'
   'meta-S': 'save-all'
diff --git a/src/app/keymaps/editor.coffee b/src/app/keymaps/editor.coffee
index ce6e17584..50981e63a 100644
--- a/src/app/keymaps/editor.coffee
+++ b/src/app/keymaps/editor.coffee
@@ -7,8 +7,6 @@ window.keymap.bindKeys '.editor',
   'meta-x': 'cut'
   'meta-c': 'copy'
   'meta-v': 'paste'
-  'meta-z': 'undo'
-  'meta-Z': 'redo'
   'alt-meta-w': 'toggle-soft-wrap'
   'ctrl-[': 'fold-current-row'
   'ctrl-]': 'unfold-current-row'