blob: 588a605a9a8b895d3d21b20b482b3e3f09e8ffb4 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
#+TITLE: Ediff
#+BEGIN_SRC emacs-lisp
(require 'ediff)
#+END_SRC
Don't use a special frame for the ediff control buffer.
#+BEGIN_SRC emacs-lisp
(setq ediff-window-setup-function 'ediff-setup-windows-plain)
#+END_SRC
Show the different buffers next to eachother instead of underneath
eachother.
#+BEGIN_SRC emacs-lisp
(setq ediff-split-window-function 'split-window-horizontally)
#+END_SRC
Don't show whitespace changes in ediff buffers.
#+BEGIN_SRC emacs-lisp
(setq ediff-diff-options "-w")
#+END_SRC
Show ediff in a fullscreen frame.
#+BEGIN_SRC emacs-lisp
(defun oni:turn-on-fullscreen ()
(unless (memq (frame-parameter nil 'fullscreen)
'(fullscreen fullboth))
(set-frame-parameter nil 'fullscreen 'fullboth)))
(defun oni:turn-off-fullscreen ()
(when (memq (frame-parameter nil 'fullscreen)
'(fullscreen fullboth))
(set-frame-parameter nil 'fullscreen nil)))
(add-hook 'ediff-mode-hook 'oni:turn-on-fullscreen)
(add-hook 'ediff-cleanup-hook 'oni:turn-off-fullscreen)
#+END_SRC
|
