From 4b115905886db190bc722342b24492a01a1ecca4 Mon Sep 17 00:00:00 2001 From: Maximilian Wolff Date: Fri, 27 Mar 2020 20:40:15 +0100 Subject: [PATCH] [git] Make M-X switch windows in magit buffers Before M-1 M-2 M-3 M-4 were bound by magit to show fixed numbers of details. Now these bindings are available with 1 2 3 4 instead. The M-X bindings are now used for quick switching of windows as in the rest of spacemacs. --- layers/+source-control/git/packages.el | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/layers/+source-control/git/packages.el b/layers/+source-control/git/packages.el index 7e5b38eba..6c3761b4e 100644 --- a/layers/+source-control/git/packages.el +++ b/layers/+source-control/git/packages.el @@ -31,8 +31,8 @@ org (orgit :requires org) smeargle - transient - )) + transient)) + (defun git/pre-init-golden-ratio () (spacemacs|use-package-add-hook golden-ratio @@ -230,7 +230,17 @@ Press [_b_] again to blame further in the history, [_q_] to go up or quit." 'magit-display-buffer-fullframe-status-v1)) (spacemacs|hide-lighter with-editor-mode) ;; Workaround for #12747 - org-mode - (evil-define-key 'normal magit-blame-read-only-mode-map (kbd "RET") 'magit-show-commit)))) + (evil-define-key 'normal magit-blame-read-only-mode-map (kbd "RET") 'magit-show-commit) + ;; Make sure that M-m still switch windows in all magit buffers + (evil-define-key 'normal magit-section-mode-map (kbd "M-1") 'winum-select-window-1) + (evil-define-key 'normal magit-section-mode-map (kbd "M-2") 'winum-select-window-2) + (evil-define-key 'normal magit-section-mode-map (kbd "M-3") 'winum-select-window-3) + (evil-define-key 'normal magit-section-mode-map (kbd "M-4") 'winum-select-window-4) + (evil-define-key 'normal magit-section-mode-map (kbd "M-5") 'winum-select-window-5) + (evil-define-key 'normal magit-section-mode-map (kbd "M-6") 'winum-select-window-6) + (evil-define-key 'normal magit-section-mode-map (kbd "M-7") 'winum-select-window-7) + (evil-define-key 'normal magit-section-mode-map (kbd "M-8") 'winum-select-window-8) + (evil-define-key 'normal magit-section-mode-map (kbd "M-9") 'winum-select-window-9)))) (defun git/init-magit-gitflow () (use-package magit-gitflow