fscotto/infra
1
0
Fork 0
mirror of https://github.com/fscotto/infra.git synced 2026-05-31 07:49:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add vdiff and ztree tooling

Browse Source
This commit is contained in:
Fabio Scotto di Santolo
2026-04-12 22:45:05 +02:00
parent 675f686a46
commit 10fd3e9888
3 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
dotfiles/desktop/.emacs.d/lisp/misc/vcs.el
View File

@@ -11,6 +11,31 @@
'(("~/Projects" . 2)
("~/Work" . 2))))
(use-package vdiff
:ensure t
:commands (vdiff-current-file vdiff-files vdiff-merge-conflict)
:custom
(vdiff-lock-scrolling t)
(vdiff-auto-refine t))
(use-package vdiff-magit
:ensure t
:after (magit vdiff)
:commands (vdiff-magit vdiff-magit-dwim)
:custom
(vdiff-magit-use-ediff-for-merges nil)
:config
(define-key magit-mode-map "e" #'vdiff-magit-dwim)
(define-key magit-mode-map "E" #'vdiff-magit)
(transient-suffix-put 'magit-dispatch "e" :description "vdiff (dwim)")
(transient-suffix-put 'magit-dispatch "e" :command #'vdiff-magit-dwim)
(transient-suffix-put 'magit-dispatch "E" :description "vdiff")
(transient-suffix-put 'magit-dispatch "E" :command #'vdiff-magit))
(use-package ztree
:ensure t
:commands (ztree-diff ztree-dir))
(provide 'vcs)
;;; vcs.el ends here