diff options
| author |  Tom Willemse | 2019-02-26 01:33:22 -0800 |
|---|---|---|
| committer | Tom Willemse | 2019-02-26 01:33:22 -0800 |
| commit | c9e395d30140b59100babb5ccb1b3f835f6862ac (patch) | |
| tree | d752bdcf738677baeee124ddee1525ab2d6797cb /emacs | |
| parent | 4b03266c722b771ca92cb2d4be75090d05046ecc (diff) | |
| download | new-dotfiles-c9e395d30140b59100babb5ccb1b3f835f6862ac.tar.gz new-dotfiles-c9e395d30140b59100babb5ccb1b3f835f6862ac.zip | |
Move Ediff configuration to emacs-config
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/.emacs.d/init.el | 1 | ||||
| -rw-r--r-- | emacs/.emacs.d/init/oni-ediff-init.el | 49 |
2 files changed, 0 insertions, 50 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 9c38785..9136e58 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -162,7 +162,6 @@ ;; (propertize (concat " " (char-to-string #xf233)) ;; 'face '(:family "Font Awesome" :height 0.75)))) -(with-eval-after-load 'ediff (load "oni-ediff-init")) (with-eval-after-load 'elec-pair (load "oni-elec-pair-init")) (with-eval-after-load 'eshell (load "oni-eshell-init")) (with-eval-after-load 'gnus (load "oni-gnus-init")) diff --git a/emacs/.emacs.d/init/oni-ediff-init.el b/emacs/.emacs.d/init/oni-ediff-init.el deleted file mode 100644 index 9d91bcc..0000000 --- a/emacs/.emacs.d/init/oni-ediff-init.el +++ /dev/null @@ -1,49 +0,0 @@ -;;; oni-ediff-init.el --- My Ediff configuration -*- lexical-binding: t; -*- - -;; Copyright (C) 2018 Tom Willemse - -;; Author: Tom Willemse <tom@ryuslash.org> -;; 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 <https://www.gnu.org/licenses/>. - -;;; 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 |