.emacs.d

My Emacs configuration files.
Log | Files | Refs | README

commit 0ee0f087d20826c0475b9df7e89b1da61064077d
parent 1145b635cadd528f30fe194e328290b8e6c8534d
Author: Hugo Soucy <hugo.soucy@savoirfairelinux.com>
Date:   Mon, 13 Mar 2017 08:40:21 -0400

Customize a litte bit of ediff.

Diffstat:
Minit.el | 13+++++++++++++
1 file changed, 13 insertions(+), 0 deletions(-)

diff --git a/init.el b/init.el @@ -104,6 +104,19 @@ ;; Setup key bindings (require 'setup-company-mode) +;; Ediff +;; Source <https://oremacs.com/2015/01/17/setting-up-ediff/> +(defmacro csetq (variable value) + `(funcall (or (get ',variable 'custom-set) + 'set-default) + ',variable ,value)) + +(csetq ediff-window-setup-function 'ediff-setup-windows-plain) +(csetq ediff-split-window-function 'split-window-horizontally) +(csetq ediff-diff-options "-w") +;; (winner-mode) +;; (add-hook 'ediff-after-quit-hook-internal 'winner-undo) + ;; Bookmarks ;; To have emacs open bookmarks on startup (setq inhibit-splash-screen t)