From 4348c17433e371b14f803bf0fdc954ba309d5022 Mon Sep 17 00:00:00 2001 From: Robert O'Connor Date: Fri, 12 Feb 2016 03:08:48 -0500 Subject: [PATCH] =?UTF-8?q?Switch=20=E2=80=9Cbc=E2=80=9D->=E2=80=9Cbd?= =?UTF-8?q?=E2=80=9D=20and=20=E2=80=9Cwc=E2=80=9D->=E2=80=9Cwd=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also: - switch spacemacs layouts to the same. - Add “wD” for ace-delete-window - switch window dedication toggle to “wt” - all documentation has been updated to reflect these changes Closes #5031 --- doc/DOCUMENTATION.org | 16 ++++++++-------- .../+distribution/spacemacs-base/keybindings.el | 15 ++++++++------- .../spacemacs-layouts/README.org | 4 ++-- .../spacemacs-layouts/packages.el | 4 ++-- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/doc/DOCUMENTATION.org b/doc/DOCUMENTATION.org index 12d0f6478..1d1506318 100644 --- a/doc/DOCUMENTATION.org +++ b/doc/DOCUMENTATION.org @@ -1521,9 +1521,9 @@ Windows manipulation commands (start with ~w~): |------------------------+-----------------------------------------------------------------------------| | ~SPC w =~ | balance split windows | | ~SPC w b~ | force the focus back to the minibuffer (usefull with =helm= popups) | -| ~SPC w c~ | close a window | -| ~SPC w C~ | delete another window using [[https://github.com/abo-abo/ace-window][ace-delete-window]] | -| ~SPC w d~ | toggle window dedication (dedicated window cannot be reused by a mode) | +| ~SPC w d~ | close a window | +| ~SPC w D~ | delete another window using [[https://github.com/abo-abo/ace-window][ace-delete-window]] | +| ~SPC w t~ | toggle window dedication (dedicated window cannot be reused by a mode) | | ~SPC w f~ | toggle follow mode | | ~SPC w h~ | move to window on the left | | ~SPC w H~ | move window to the left | @@ -1555,7 +1555,7 @@ window resizing. | Key Binding | Description | |---------------+---------------------------------------------------------------| -| ~SPC w .~ | initiate transient-state | +| ~SPC w .~ | initiate transient-state | | ~?~ | display the full documentation in minibuffer | | ~0~ | go to window number 0 | | ~1~ | go to window number 1 | @@ -1573,8 +1573,8 @@ window resizing. | ~]~ | enlarge window horizontally | | ~{~ | shrink window vertically | | ~}~ | enlarge window vertically | -| ~c~ | close window | -| ~C~ | close other windows | +| ~d~ | close window | +| ~D~ | close other windows | | ~g~ | toggle =golden-ratio= on and off | | ~h~ | go to window on the left | | ~j~ | go to window below | @@ -1593,7 +1593,7 @@ window resizing. | ~v~ | vertical split | | ~V~ | horizontal split and focus new window | | ~w~ | focus other window | -| Any other key | leave the transient-state | +| Any other key | leave the transient-state | **** Golden ratio If you resize windows like crazy you may want to give a try to [[https://github.com/roman/golden-ratio.el][golden-ratio]]. @@ -1619,7 +1619,7 @@ Buffer manipulation commands (start with ~b~): |-------------+--------------------------------------------------------------------------| | ~SPC TAB~ | switch to alternate buffer in the current window (switch back and forth) | | ~SPC b b~ | switch to a buffer using =helm= | -| ~SPC b c~ | kill the current buffer (does not delete the visited file) | +| ~SPC b d~ | kill the current buffer (does not delete the visited file) | | ~SPC b e~ | erase the content of the buffer (ask for confirmation) | | ~SPC b h~ | open =*spacemacs*= home buffer | | ~SPC b k~ | kill a buffer | diff --git a/layers/+distribution/spacemacs-base/keybindings.el b/layers/+distribution/spacemacs-base/keybindings.el index ce93e0d7e..8b157e68b 100644 --- a/layers/+distribution/spacemacs-base/keybindings.el +++ b/layers/+distribution/spacemacs-base/keybindings.el @@ -58,7 +58,7 @@ "au" 'undo-tree-visualize) ;; buffers -------------------------------------------------------------------- (spacemacs/set-leader-keys - "bc" 'kill-this-buffer + "bd" 'kill-this-buffer "TAB" 'spacemacs/alternate-buffer "bh" 'spacemacs/home "be" 'spacemacs/safe-erase-buffer @@ -296,8 +296,9 @@ "w2" 'spacemacs/layout-double-columns "w3" 'spacemacs/layout-triple-columns "wb" 'spacemacs/switch-to-minibuffer-window - "wc" 'delete-window - "wd" 'spacemacs/toggle-current-window-dedication + "wd" 'delete-window + "wD" 'ace-delete-window + "wt" 'spacemacs/toggle-current-window-dedication "wf" 'follow-mode "wH" 'evil-window-move-far-left "w " 'evil-window-move-far-left @@ -414,8 +415,8 @@ Select^^^^ Move^^^^ Split^^ Resize^^ [_j_/_k_] down/up [_J_/_K_] down/up [_s_] vertical [_[_] shrink horizontally [_q_] quit [_h_/_l_] left/right [_h_/_l_] left/right [_S_] vert & follow [_]_] enlarge horizontally [_u_] restore prev layout [_0_-_9_] window N [_R_]^^ rotate [_v_] horizontal [_{_] shrink vertically [_U_] restore next layout -[_w_]^^ other window ^^^^ [_V_] horiz & follow [_}_] enlarge vertically [_c_] close current -[_o_]^^ other frame ^^^^ ^^ ^^ [_C_] close other +[_w_]^^ other window ^^^^ [_V_] horiz & follow [_}_] enlarge vertically [_d_] close current +[_o_]^^ other frame ^^^^ ^^ ^^ [_D_] close other ^^^^ ^^^^ ^^ ^^ [_g_] golden-ratio %`golden-ratio-mode " :bindings @@ -436,8 +437,8 @@ Select^^^^ Move^^^^ Split^^ Resize^^ ("]" spacemacs/enlarge-window-horizontally) ("{" spacemacs/shrink-window) ("}" spacemacs/enlarge-window) - ("c" delete-window) - ("C" delete-other-windows) + ("d" delete-window) + ("D" delete-other-windows) ("g" spacemacs/toggle-golden-ratio) ("h" evil-window-left) ("" evil-window-left) diff --git a/layers/+window-management/spacemacs-layouts/README.org b/layers/+window-management/spacemacs-layouts/README.org index 5fede6d9b..0fd2ab26f 100644 --- a/layers/+window-management/spacemacs-layouts/README.org +++ b/layers/+window-management/spacemacs-layouts/README.org @@ -43,8 +43,8 @@ The layouts transient-state is initiated with ~SPC l~. | ~a~ | add a buffer to the current layout | | ~A~ | add all the buffers from another layout in the current one | | ~b~ | select a buffer in the current layout | -| ~c~ | close the current layout and keep its buffers | -| ~C~ | close the other layouts and keep their buffers | +| ~d~ | close the current layout and keep its buffers | +| ~D~ | close the other layouts and keep their buffers | | ~h~ | go to default layout | | ~C-h~ | previous layout in list | | ~l~ | select/create a layout with helm | diff --git a/layers/+window-management/spacemacs-layouts/packages.el b/layers/+window-management/spacemacs-layouts/packages.el index 3d65c3763..1bc4bdf63 100644 --- a/layers/+window-management/spacemacs-layouts/packages.el +++ b/layers/+window-management/spacemacs-layouts/packages.el @@ -139,8 +139,8 @@ ("a" persp-add-buffer :exit t) ("A" persp-import-buffers :exit t) ("b" spacemacs/persp-helm-mini :exit t) - ("c" spacemacs/layouts-ms-close) - ("C" spacemacs/layouts-ms-close-other :exit t) + ("d" spacemacs/layouts-ms-close) + ("D" spacemacs/layouts-ms-close-other :exit t) ("h" spacemacs/layout-goto-default :exit t) ("l" spacemacs/helm-perspectives :exit t) ("L" persp-load-state-from-file :exit t)