From bb3320e5530a0a93d7cddd23444f9cd04af20e0d Mon Sep 17 00:00:00 2001
From: Damien Guard <damieng@gmail.com>
Date: Wed, 5 Oct 2016 17:38:49 -0700
Subject: [PATCH] Move emacs alt-*/editor bindings to darwin to avoid menu
 conflicts on Win/Linux. Addresses some of #4057

---
 keymaps/darwin.cson | 14 ++++++++++++++
 keymaps/emacs.cson  | 13 -------------
 2 files changed, 14 insertions(+), 13 deletions(-)
 delete mode 100644 keymaps/emacs.cson

diff --git a/keymaps/darwin.cson b/keymaps/darwin.cson
index 953fb0c48..4ae6d88db 100644
--- a/keymaps/darwin.cson
+++ b/keymaps/darwin.cson
@@ -133,6 +133,20 @@
   'cmd-ctrl-left': 'editor:move-selection-left'
   'cmd-ctrl-right': 'editor:move-selection-right'
 
+  # Emacs
+  'alt-f': 'editor:move-to-end-of-word'
+  'alt-ctrl-f': 'editor:move-to-next-subword-boundary'
+  'alt-F': 'editor:select-to-end-of-word'
+  'alt-ctrl-F': 'editor:select-to-next-subword-boundary'
+  'alt-b': 'editor:move-to-beginning-of-word'
+  'alt-ctrl-b': 'editor:move-to-previous-subword-boundary'
+  'alt-B': 'editor:select-to-beginning-of-word'
+  'alt-ctrl-B': 'editor:select-to-previous-subword-boundary'
+  'alt-h': 'editor:delete-to-beginning-of-word'
+  'alt-ctrl-h': 'editor:delete-to-beginning-of-subword'
+  'alt-d': 'editor:delete-to-end-of-word'
+  'alt-ctrl-d': 'editor:delete-to-end-of-subword'
+
   # Sublime Parity
   'cmd-a': 'core:select-all'
   'cmd-alt-p': 'editor:log-cursor-scope'
diff --git a/keymaps/emacs.cson b/keymaps/emacs.cson
deleted file mode 100644
index 764c97938..000000000
--- a/keymaps/emacs.cson
+++ /dev/null
@@ -1,13 +0,0 @@
-'atom-text-editor':
-  'alt-f': 'editor:move-to-end-of-word'
-  'alt-ctrl-f': 'editor:move-to-next-subword-boundary'
-  'alt-F': 'editor:select-to-end-of-word'
-  'alt-ctrl-F': 'editor:select-to-next-subword-boundary'
-  'alt-b': 'editor:move-to-beginning-of-word'
-  'alt-ctrl-b': 'editor:move-to-previous-subword-boundary'
-  'alt-B': 'editor:select-to-beginning-of-word'
-  'alt-ctrl-B': 'editor:select-to-previous-subword-boundary'
-  'alt-h': 'editor:delete-to-beginning-of-word'
-  'alt-ctrl-h': 'editor:delete-to-beginning-of-subword'
-  'alt-d': 'editor:delete-to-end-of-word'
-  'alt-ctrl-d': 'editor:delete-to-end-of-subword'