From e2594671af9056b4da13a64646211ebc71c3879d Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Thu, 13 Sep 2018 22:05:05 -0700 Subject: Move all configuration from org to elisp files --- emacs/.emacs.d/init/oni-ediff-init.el | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 emacs/.emacs.d/init/oni-ediff-init.el (limited to 'emacs/.emacs.d/init/oni-ediff-init.el') diff --git a/emacs/.emacs.d/init/oni-ediff-init.el b/emacs/.emacs.d/init/oni-ediff-init.el new file mode 100644 index 0000000..9d91bcc --- /dev/null +++ b/emacs/.emacs.d/init/oni-ediff-init.el @@ -0,0 +1,49 @@ +;;; oni-ediff-init.el --- My Ediff configuration -*- lexical-binding: t; -*- + +;; Copyright (C) 2018 Tom Willemse + +;; Author: Tom Willemse +;; Keywords: local + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . + +;;; Commentary: + +;; My Ediff configuration. + +;;; Code: + +(require 'ediff) + +(setq ediff-window-setup-function 'ediff-setup-windows-plain) + +(setq ediff-split-window-function 'split-window-horizontally) + +(setq ediff-diff-options "-w") + +(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) + +(provide 'oni-ediff-init) +;;; oni-ediff-init.el ends here -- cgit v1.2.3-54-g00ecf