emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add ediff config

Browse source
This commit is contained in:
Henrik Lissner 2016-10-05 20:45:58 +02:00
parent 62d220d863
commit dd07f33ca5
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/core-editor.el
View file

@ -85,7 +85,6 @@
windows)) windows))
(winner-mode 1) (winner-mode 1)
;; Let editorconfig handle global whitespace settings ;; Let editorconfig handle global whitespace settings
(use-package editorconfig :demand t (use-package editorconfig :demand t
:mode ("\\.?editorconfig$" . editorconfig-conf-mode) :mode ("\\.?editorconfig$" . editorconfig-conf-mode)
@ -95,6 +94,16 @@
(add-hook! 'editorconfig-custom-hooks (add-hook! 'editorconfig-custom-hooks
(if indent-tabs-mode (whitespace-mode +1)))) (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 ;; Hooks 'n hacks

3
core/core.el
View file

@ -123,9 +123,6 @@ major-modes, the process gets killed.")
confirm-nonexistent-file-or-buffer t confirm-nonexistent-file-or-buffer t
delete-by-moving-to-trash t delete-by-moving-to-trash t
echo-keystrokes 0.02 ; show me what I type echo-keystrokes 0.02 ; show me what I type
ediff-diff-options "-w"
ediff-split-window-function 'split-window-horizontally ; side-by-side diffs
ediff-window-setup-function 'ediff-setup-windows-plain ; no extra frames
enable-recursive-minibuffers nil ; no minibufferception enable-recursive-minibuffers nil ; no minibufferception
idle-update-delay 5 ; update a little less often idle-update-delay 5 ; update a little less often
major-mode 'text-mode major-mode 'text-mode