awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-01 12:17:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move ediff config to core-vcs + brighten ediff buffers

Browse Source
This commit is contained in:
Henrik Lissner
2017-01-07 03:02:41 -05:00
parent 1309f6baff
commit 9d55ef49e6
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/core-editor.el
View File

@ -95,16 +95,6 @@
(add-hook! 'editorconfig-custom-hooks
(if indent-tabs-mode (whitespace-mode +1))))
;; Ediff
(setq ediff-diff-options "-w"
ediff-split-window-function 'split-window-horizontally
;; no extra frames
ediff-window-setup-function 'ediff-setup-windows-plain)
(defvar doom-ediff-enabled nil)
(add-hook! ediff-startup (setq doom-ediff-enabled t))
(add-hook! ediff-quit (setq doom-ediff-enabled nil))
;;
;; Hooks 'n hacks