aboutsummaryrefslogtreecommitdiffstats
path: root/emacs/.emacs.d/init.org
diff options
context:
space:
mode:
authorGravatar Tom Willemse2016-10-14 01:16:24 +0200
committerGravatar Tom Willemse2016-10-14 01:16:24 +0200
commit5d64560cec9f876bbc07679ebffd61e775368f4a (patch)
treea6888ce32d008579bced3877496b2ebe74cb2ee8 /emacs/.emacs.d/init.org
parent4813d15f0e71aa45290631667715f072426ba78f (diff)
downloadnew-dotfiles-5d64560cec9f876bbc07679ebffd61e775368f4a.tar.gz
new-dotfiles-5d64560cec9f876bbc07679ebffd61e775368f4a.zip
Add Ediff configuration
Diffstat (limited to 'emacs/.emacs.d/init.org')
-rw-r--r--emacs/.emacs.d/init.org6
1 files changed, 6 insertions, 0 deletions
diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index dcbb14b..4e79fb0 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -942,6 +942,12 @@ To start off, first I need to enable lexical binding.
(with-eval-after-load 'magit (load "magit-init"))
#+END_SRC
+ - [[file:init/ediff-init.org][Ediff]] :: A reall diff application.
+
+ #+BEGIN_SRC emacs-lisp
+ (with-eval-after-load 'ediff (load "ediff-init"))
+ #+END_SRC
+
** Gnus
Gnus is one of the most extensible Email programs on the