diff options
| author |  Tom Willemse | 2018-09-13 22:05:05 -0700 |
|---|---|---|
| committer | Tom Willemse | 2018-09-13 22:06:30 -0700 |
| commit | e2594671af9056b4da13a64646211ebc71c3879d (patch) | |
| tree | 7fd399b511de7115186775b33786d0213e087100 /emacs/.emacs.d/init/oni-ediff-init.org | |
| parent | cd9f77887e0b7881403a4db0d1d65117cda7b4db (diff) | |
| download | new-dotfiles-e2594671af9056b4da13a64646211ebc71c3879d.tar.gz new-dotfiles-e2594671af9056b4da13a64646211ebc71c3879d.zip | |
Move all configuration from org to elisp files
Diffstat (limited to 'emacs/.emacs.d/init/oni-ediff-init.org')
| -rw-r--r-- | emacs/.emacs.d/init/oni-ediff-init.org | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/emacs/.emacs.d/init/oni-ediff-init.org b/emacs/.emacs.d/init/oni-ediff-init.org deleted file mode 100644 index 588a605..0000000 --- a/emacs/.emacs.d/init/oni-ediff-init.org +++ /dev/null @@ -1,41 +0,0 @@ -#+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 |