From 02c9b3fb5f7115ab8cc68edbb85fdb0f3d232fab Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Mon, 31 Oct 2016 12:23:11 -0500 Subject: [PATCH] :bug: Fix focus keymaps for empty pane (fix #1057) Previously, focus on an empty pane would break the focus pane keymaps, as the keymaps were scoped to `atom-text-editor.vim-mode`. --- keymaps/vim-mode.cson | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/keymaps/vim-mode.cson b/keymaps/vim-mode.cson index da34dd06..d9cd02f2 100644 --- a/keymaps/vim-mode.cson +++ b/keymaps/vim-mode.cson @@ -1,3 +1,21 @@ +'body': + 'ctrl-w ctrl-h': 'window:focus-pane-on-left' + 'ctrl-w h': 'window:focus-pane-on-left' + 'ctrl-w left': 'window:focus-pane-on-left' + 'ctrl-w ctrl-l': 'window:focus-pane-on-right' + 'ctrl-w l': 'window:focus-pane-on-right' + 'ctrl-w right': 'window:focus-pane-on-right' + 'ctrl-w ctrl-k': 'window:focus-pane-above' + 'ctrl-w k': 'window:focus-pane-above' + 'ctrl-w up': 'window:focus-pane-above' + 'ctrl-w ctrl-j': 'window:focus-pane-below' + 'ctrl-w j': 'window:focus-pane-below' + 'ctrl-w down': 'window:focus-pane-below' + 'ctrl-w ctrl-w': 'window:focus-next-pane' + 'ctrl-w w': 'window:focus-next-pane' + 'ctrl-w ctrl-p': 'window:focus-previous-pane' + 'ctrl-w p': 'window:focus-previous-pane' + 'atom-text-editor.vim-mode': 'escape': 'vim-mode:reset-normal-mode' 'ctrl-c': 'vim-mode:reset-normal-mode' @@ -156,22 +174,6 @@ 'g u': 'vim-mode:lower-case' '~': 'vim-mode:toggle-case-now' - 'ctrl-w ctrl-h': 'window:focus-pane-on-left' - 'ctrl-w h': 'window:focus-pane-on-left' - 'ctrl-w left': 'window:focus-pane-on-left' - 'ctrl-w ctrl-l': 'window:focus-pane-on-right' - 'ctrl-w l': 'window:focus-pane-on-right' - 'ctrl-w right': 'window:focus-pane-on-right' - 'ctrl-w ctrl-k': 'window:focus-pane-above' - 'ctrl-w k': 'window:focus-pane-above' - 'ctrl-w up': 'window:focus-pane-above' - 'ctrl-w ctrl-j': 'window:focus-pane-below' - 'ctrl-w j': 'window:focus-pane-below' - 'ctrl-w down': 'window:focus-pane-below' - 'ctrl-w ctrl-w': 'window:focus-next-pane' - 'ctrl-w w': 'window:focus-next-pane' - 'ctrl-w ctrl-p': 'window:focus-previous-pane' - 'ctrl-w p': 'window:focus-previous-pane' 'ctrl-w ctrl-v': 'pane:split-right' 'ctrl-w v': 'pane:split-right' 'ctrl-w ctrl-s': 'pane:split-down'