diff --git a/init.el b/init.el index caa8c2f..b0e5207 100644 --- a/init.el +++ b/init.el @@ -28,9 +28,6 @@ "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default))) - '(ediff-merge-split-window-function (quote split-window-horizontally)) - '(ediff-split-window-function (quote split-window-vertically)) - '(ediff-window-setup-function (quote ediff-setup-windows-plain)) '(eww-search-prefix "https://www.google.com/?q=") '(foreground-color "#5c5cff") '(global-hl-line-mode t) @@ -503,6 +500,12 @@ :bind (("M-X" . helm-smex))) +(use-package ediff + :init + (setq-default ediff-merge-split-window-function 'split-window-horizontally + ediff-split-window-function 'split-window-vertically + ediff-window-setup-function 'ediff-setup-windows-plain)) + ;; Load my own functions (load "gnu-c-header.el") (load "toggle-window-split.el")