diff options
| author | Case Duckworth | 2021-09-13 19:52:36 -0500 |
|---|---|---|
| committer | Case Duckworth | 2021-09-13 19:52:36 -0500 |
| commit | b6cc87ca3871a44d6b3098b2119fbee230693b31 (patch) | |
| tree | 8eb6e738dd69c541d2310aab166a533e03dca6d7 /init.el | |
| parent | Merge branch 'main' of https://tildegit.org/acdw/emacs (diff) | |
| download | emacs-b6cc87ca3871a44d6b3098b2119fbee230693b31.tar.gz emacs-b6cc87ca3871a44d6b3098b2119fbee230693b31.zip | |
Configure ediff
Diffstat (limited to 'init.el')
| -rw-r--r-- | init.el | 7 |
1 files changed, 5 insertions, 2 deletions
| diff --git a/init.el b/init.el index 9fbc245..13121e7 100644 --- a/init.el +++ b/init.el | |||
| @@ -589,8 +589,11 @@ AKA, DO NOT USE THIS FUNCTION!!!" | |||
| 589 | cmd)))))) | 589 | cmd)))))) |
| 590 | 590 | ||
| 591 | (setup ediff | 591 | (setup ediff |
| 592 | (:option ediff-window-setup-function #'ediff-setup-windows-plain | 592 | (:option ediff-diff-options "-w" ; ignore whitespace |
| 593 | ediff-split-window-function #'split-window-horizontally)) | 593 | ediff-window-setup-function #'ediff-setup-windows-plain |
| 594 | ediff-split-window-function #'split-window-horizontally) | ||
| 595 | ;; https://oremacs.com/2015/01/17/setting-up-ediff/ | ||
| 596 | (add-hook 'ediff-after-quit-hook-internal #'winner-undo)) | ||
| 594 | 597 | ||
| 595 | (setup (:straight edit-indirect)) | 598 | (setup (:straight edit-indirect)) |
| 596 | 599 | ||