Fix forge evil keybinds (#15167)

* [git] Fix: Evil-collection @-dispatch keybindings for magit forge.

Load new location for forge '@' dispatch keybindings.

'Evil-collection' has moved keymaps for magit forge from an
'with-eval-after-load' block to newfile 'evil-collection-forge.el' in commit
33461aa545.

As mentioned in the commit, these changes were due to a upstream change in the
'forge' package. Source: https://github.com/emacs-evil/evil-collection/issues/543

* [git] Docs: update README to reflect changes in Forge keybinds.

See https://magit.vc/manual/forge.html#Introduction for more information.
This commit is contained in:
Hans 2021-11-19 11:52:11 -05:00 committed by GitHub
parent f06fb38a8f
commit dee70b8486
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions

View File

@ -388,17 +388,17 @@ In a =magit-status= buffer (~SPC g s~):
| Key binding | Description |
|-------------+-----------------------------------------------------------|
| ~b Y~ | create branch from pull-request |
| ~b y~ | create and check out branch from pull-request |
| ~F f~ | fetch issues and pull-requests |
| ~F n~ | fetch notifications |
| ~F p~ | create pull-request |
| ~F i~ | create issue |
| ~F F~ | list notifications |
| ~F P~ | list pull-requests |
| ~F I~ | list issues |
| ~p y~ | pull pull-requests and issues for the current repository |
| ~p Y~ | pull all notifications for the current repository's forge |
| ~b N~ | create branch from pull-request |
| ~b F~ | create and check out branch from pull-request |
| ~@ f f~ | fetch issues and pull-requests |
| ~@ f n~ | fetch notifications |
| ~@ c p~ | create pull-request |
| ~@ c i~ | create issue |
| ~@ l n~ | list notifications |
| ~@ l p~ | list pull-requests |
| ~@ l i~ | list issues |
| ~f n~ | pull pull-requests and issues for the current repository |
| ~f N~ | pull all notifications for the current repository's forge |
In a =forge-topic= buffer:

View File

@ -57,7 +57,10 @@
(defun git/pre-init-evil-collection ()
(when (spacemacs//support-evilified-buffer-p)
(add-to-list 'spacemacs-evil-collection-allowed-list 'magit)))
(add-to-list 'spacemacs-evil-collection-allowed-list 'magit)
;; See `git-packages' form in this file.
(unless (spacemacs/system-is-mswindows)
(add-to-list 'spacemacs-evil-collection-allowed-list 'forge))))
(defun git/post-init-fill-column-indicator ()
(add-hook 'git-commit-mode-hook 'fci-mode))