diff options
| author | Case Duckworth | 2021-04-02 12:56:41 -0500 |
|---|---|---|
| committer | Case Duckworth | 2021-04-02 12:56:41 -0500 |
| commit | 6a7d8e7b71933add806b438e22a90b2f236c532d (patch) | |
| tree | 40f91efc4123152302c984527ccbce083296d9a3 /init.el | |
| parent | Fix eshell mode line (diff) | |
| download | emacs-6a7d8e7b71933add806b438e22a90b2f236c532d.tar.gz emacs-6a7d8e7b71933add806b438e22a90b2f236c532d.zip | |
Setup `ediff'
Diffstat (limited to 'init.el')
| -rw-r--r-- | init.el | 5 |
1 files changed, 5 insertions, 0 deletions
| diff --git a/init.el b/init.el index 3f44ce5..26dd784 100644 --- a/init.el +++ b/init.el | |||
| @@ -322,6 +322,11 @@ | |||
| 322 | #'eshell-quit-or-delete-char) | 322 | #'eshell-quit-or-delete-char) |
| 323 | (setq mode-line-format '(:eval simple-modeline--mode-line))))) | 323 | (setq mode-line-format '(:eval simple-modeline--mode-line))))) |
| 324 | 324 | ||
| 325 | ;;;; Ediff | ||
| 326 | (setup ediff | ||
| 327 | (:option ediff-window-setup-function 'ediff-setup-windows-plain | ||
| 328 | ediff-split-window-function 'split-window-horizontally)) | ||
| 329 | |||
| 325 | ;;;; Debugger | 330 | ;;;; Debugger |
| 326 | (setup debugger | 331 | (setup debugger |
| 327 | (:hook visual-line-mode) | 332 | (:hook visual-line-mode) |