gergely/my-emacs-d
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move ediff configuration to use-package

Browse Source
This commit is contained in:
Gergely Polonkai 2016-10-17 10:22:20 +02:00
parent 7880bf742c
commit 4ab3da659c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
init.el
View File

@ -28,9 +28,6 @@
"1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365"
"fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6"
default))) 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=") '(eww-search-prefix "https://www.google.com/?q=")
'(foreground-color "#5c5cff") '(foreground-color "#5c5cff")
'(global-hl-line-mode t) '(global-hl-line-mode t)
@ -503,6 +500,12 @@
:bind :bind
(("M-X" . helm-smex))) (("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 my own functions
(load "gnu-c-header.el") (load "gnu-c-header.el")
(load "toggle-window-split.el") (load "toggle-window-split.el")