summaryrefslogtreecommitdiff
path: root/init.el
diff options
context:
space:
mode:
authorCraig Jennings <c@cjennings.net>2025-08-17 09:40:20 -0500
committerCraig Jennings <c@cjennings.net>2025-08-17 09:40:20 -0500
commit4235fb7c04d41e86a477f8ec9be7d254a98419c8 (patch)
treeae36860af1bb96278424ef11b1d4a809b058d05c /init.el
parent509beb5be671439ca65e96d5296846ac7f8f0949 (diff)
downloaddotemacs-4235fb7c04d41e86a477f8ec9be7d254a98419c8.tar.gz
dotemacs-4235fb7c04d41e86a477f8ec9be7d254a98419c8.zip
feat(ediff): consolidate config and add ztree integration
Replace the custom `csetq` macro with a `use-package` setup for Ediff, configuring plain windows, horizontal splits, whitespace-ignoring diffs, and current-change highlighting. Introduce a ā€œC-c eā€ prefix map for quick Ediff commands (files, buffers, revisions, directories) plus ā€œdā€ for `ztree-diff`. Enable `winner-mode`, remap j/k/q in Ediff, and add ERT tests to verify key bindings and teardown behavior.
Diffstat (limited to 'init.el')
0 files changed, 0 insertions, 0 deletions