emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ui/vc emacs/vc: unify hydra design

Browse source 
this design will also break less based on the fonts
This commit is contained in:
Benjamin Andresen 2018-06-23 16:25:58 +02:00
parent a53503eadb
commit 61cdac230f
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/emacs/vc/config.el
View file

@ -72,15 +72,15 @@
;; no merge conflicts remain. ;; no merge conflicts remain.
:post (smerge-auto-leave)) :post (smerge-auto-leave))
" "
╭────────┐ [smerge]
Movement Keep Diff Other │ smerge │ Movement Keep Diff Other
╭─────────────────────────────────────────────────┴────────╯ ╭─────────────────────────────────────────────────────────╯
^_g_^ [_b_] base [_<_] upper/base [_C_] Combine ^_g_^ [_b_] base [_<_] upper/base [_C_] Combine
^_C-k_^ [_u_] upper [_=_] upper/lower [_r_] resolve ^_C-k_^ [_u_] upper [_=_] upper/lower [_r_] resolve
^_k_ ↑^ [_l_] lower [_>_] base/lower [_R_] remove ^_k_ ↑^ [_l_] lower [_>_] base/lower [_R_] remove
^_j_ ↓^ [_a_] all [_H_] hightlight ^_j_ ↓^ [_a_] all [_H_] hightlight
^_C-j_^ [_RET_] current [_E_] ediff ╭────────── ^_C-j_^ [_RET_] current [_E_] ediff ╭──────────
^_G_^ │ [_q_] quit" ^_G_^ │ [_q_] quit"
("g" (progn (goto-char (point-min)) (smerge-next))) ("g" (progn (goto-char (point-min)) (smerge-next)))
("G" (progn (goto-char (point-max)) (smerge-prev))) ("G" (progn (goto-char (point-max)) (smerge-prev)))
("C-j" smerge-next) ("C-j" smerge-next)

12
modules/ui/vc-gutter/config.el
View file

@ -54,15 +54,15 @@ to the right fringe.")
(defhydra +version-control@git-gutter (defhydra +version-control@git-gutter
(:body-pre (git-gutter-mode 1) :hint nil) (:body-pre (git-gutter-mode 1) :hint nil)
" "
╭─────────────────┐ [git gutter]
Movement Hunk Actions Misc. │ gg: +%-4s(car (git-gutter:statistic))/ -%-3s(cdr (git-gutter:statistic)) │ Movement Hunk Actions Misc. +%-4s(car (git-gutter:statistic))/ -%-4s(cdr (git-gutter:statistic))
╭──────────────────────────────────┴─────────────────╯ ╭──────────────────────────────────┴────────────────╯
^_g_^ [_s_] stage [_R_] set start Rev ^_g_^ [_s_] stage [_R_] set start Rev
^_k_^ [_r_] revert ^_k_^ [_r_] revert
^↑ ^ [_m_] mark ^↑ ^ [_m_] mark
^↓ ^ [_p_] popup ╭────────────────────── ^↓ ^ [_p_] popup ╭─────────────────────
^_j_^ │[_q_] quit ^_j_^ │[_q_] quit
^_G_^ │[_Q_] Quit and disable" ^_G_^ │[_Q_] Quit and disable"
("j" (progn (git-gutter:next-hunk 1) (recenter))) ("j" (progn (git-gutter:next-hunk 1) (recenter)))
("k" (progn (git-gutter:previous-hunk 1) (recenter))) ("k" (progn (git-gutter:previous-hunk 1) (recenter)))
("g" (progn (goto-char (point-min)) (git-gutter:next-hunk 1))) ("g" (progn (goto-char (point-min)) (git-gutter:next-hunk 1)))