TakeV/spacemacs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Fix which-key entries: gr and gs in dired and magit"

Browse source 
This reverts commit ec57b21a92.

A which-key change caused issues with this fix.
And the fix doesn't seem to be needed anymore.

The correct which-key entries appear without the fix.
This commit is contained in:
duianto 2021-06-23 16:52:46 +02:00
parent 443311c8f1
commit cf21402c5c
3 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
layers/+source-control/git/packages.el
View file

@ -269,14 +269,7 @@
(evil-define-key 'normal magit-section-mode-map (kbd "M-6") 'spacemacs/winum-select-window-6)
(evil-define-key 'normal magit-section-mode-map (kbd "M-7") 'spacemacs/winum-select-window-7)
(evil-define-key 'normal magit-section-mode-map (kbd "M-8") 'spacemacs/winum-select-window-8)
(evil-define-key 'normal magit-section-mode-map (kbd "M-9") 'spacemacs/winum-select-window-9)
;; Remove inherited bindings from evil-mc and evil-easymotion
;; do this after the config to make sure the keymap is available
(which-key-add-keymap-based-replacements magit-mode-map
"<normal-state> g r" nil
"<visual-state> g r" nil
"<normal-state> g s" nil
"<visual-state> g s" nil))))
(evil-define-key 'normal magit-section-mode-map (kbd "M-9") 'spacemacs/winum-select-window-9))))
(defun git/init-magit-delta ()
(use-package magit-delta

8
layers/+spacemacs/spacemacs-defaults/funcs.el
View file

@ -133,14 +133,6 @@ If not in such a search box, fall back on `Custom-newline'."
(defalias 'spacemacs/display-buffer-other-frame 'display-buffer-other-frame)
(defalias 'spacemacs/find-file-and-replace-buffer 'find-alternate-file)
(defun spacemacs/dired-remove-evil-mc-gr-which-key-entry ()
;; Remove inherited bindings from evil-mc
;; do this after the config to make sure the keymap is available
(with-eval-after-load 'dired
(which-key-add-keymap-based-replacements dired-mode-map
"<normal-state> g r" nil
"<visual-state> g r" nil)))
(defun spacemacs/indent-region-or-buffer ()
"Indent a region if selected, otherwise the whole buffer."
(interactive)

4
layers/+spacemacs/spacemacs-defaults/packages.el
View file

@ -144,9 +144,7 @@
(evil-define-key 'normal dired-mode-map (kbd "N") 'evil-ex-search-previous))
(when (eq 'hybrid dotspacemacs-editing-style)
(evil-define-key 'normal dired-mode-map (kbd "n") 'evil-search-next)
(evil-define-key 'normal dired-mode-map (kbd "N") 'evil-search-previous))
(add-hook 'spacemacs-post-user-config-hook
'spacemacs/dired-remove-evil-mc-gr-which-key-entry))
(evil-define-key 'normal dired-mode-map (kbd "N") 'evil-search-previous)))
(defun spacemacs-defaults/init-dired-x ()
(use-package dired-x