21 lines
1.0 KiB
Org Mode
21 lines
1.0 KiB
Org Mode
:PROPERTIES:
|
|
:ID: cce/ediff_configuration
|
|
:ROAM_ALIASES: ediff
|
|
:END:
|
|
#+TITLE: Ediff Configuration
|
|
#+filetags: :Emacs:CCE:Coding:
|
|
#+PROPERTY: header-args :mkdirp yes :results none
|
|
#+PROPERTY: header-args:emacs-lisp :tangle ediff-config.el
|
|
#+ARROYO_EMACS_MODULE: ediff-config
|
|
#+ARCOLOGY_KEY: cce/ediff-config
|
|
#+ARROYO_MODULE_WANTS: cce/configure_packaging.org
|
|
#+ARCOLOGY_ALLOW_CRAWL: t
|
|
|
|
Emacs has a visual diff'ing tool =ediff= included by default[fn:1:https://www.gnu.org/software/emacs/manual/html_mono/ediff.html]; I use it as it's designed, =ediff-buffers= and =ediff-current-file= are common entrypoints. I configure it to work well with [[id:cce/exwm][EXWM]], the default behavior of creating a buncha frames sort of doesn't work with it at all. This view of it creates a new frame, split in two horizontal windows, with the ediff control buffer underneath.
|
|
|
|
#+begin_src emacs-lisp
|
|
(provide 'cce/ediff-config)
|
|
(setq ediff-window-setup-function 'ediff-setup-windows-plain
|
|
ediff-split-window-function 'split-window-horizontally)
|
|
#+end_src
|