99b355e2fa
Magit now uses Transient instead of magit-popup, and we must adapt. Also had to replace the recently removed magit-diff-buffer-file-popup with magit-diff-buffer-file (similar but doesn't offer a popup before displaying the diff). Note some upstream packages haven't adapted to this change, but when they do we might need similar fixes: - magithub - magit-gitflow - magit-svn
44 lines
1.6 KiB
EmacsLisp
44 lines
1.6 KiB
EmacsLisp
;;; keybindings.el --- Version control keybindings
|
|
;;
|
|
;; Copyright (c) 2012-2018 Sylvain Benner & Contributors
|
|
;;
|
|
;; Author: Sylvain Benner <sylvain.benner@gmail.com>
|
|
;; URL: https://github.com/syl20bnr/spacemacs
|
|
;;
|
|
;; This file is not part of GNU Emacs.
|
|
;;
|
|
;;; License: GPLv3
|
|
|
|
(spacemacs|define-transient-state vcs
|
|
:title "VCS Transient State"
|
|
:doc "
|
|
Hunk Commands^^^^^^ Magit Commands^^^^^^ Others
|
|
----------------------------^^^^^^ ------------------------------------------^^^^^^ ------------^^
|
|
[_n_]^^^^ next hunk [_w_/_u_]^^ stage/unstage in current file [_z_] recenter
|
|
[_N_/_p_]^^ previous hunk [_c_/_C_]^^ commit with popup/direct commit [_q_] quit
|
|
[_r_/_s_/_h_] revert/stage/show [_f_/_F_/_P_] fetch/pull/push popup
|
|
[_t_]^^^^ toggle diff signs [_l_/_D_]^^ log/diff popup"
|
|
:on-enter (spacemacs/vcs-enable-margin)
|
|
:bindings
|
|
("C" magit-commit :exit t)
|
|
("d" magit-ediff :exit t)
|
|
("D" magit-diff-unstaged :exit t)
|
|
("F" magit-pull :exit t)
|
|
("P" magit-push :exit t)
|
|
("c" magit-commit :exit t)
|
|
("f" magit-fetch :exit t)
|
|
("l" magit-log :exit t)
|
|
("u" magit-unstage-file)
|
|
("w" magit-stage-file)
|
|
("n" spacemacs/vcs-next-hunk)
|
|
("N" spacemacs/vcs-previous-hunk)
|
|
("p" spacemacs/vcs-previous-hunk)
|
|
("r" spacemacs/vcs-revert-hunk)
|
|
("s" spacemacs/vcs-stage-hunk)
|
|
("h" spacemacs/vcs-show-hunk)
|
|
("t" spacemacs/toggle-version-control-margin)
|
|
("z" recenter-top-bottom)
|
|
("q" nil :exit t))
|
|
(spacemacs/set-leader-keys "g." 'spacemacs/vcs-transient-state/body)
|
|
|