;;; km-diff.el --- Diff-related extensions ;; Copyright (C) 2012-2016 Kyle Meyer ;; Author: Kyle Meyer ;; URL: https://github.com/kyleam/emacs.d ;; 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 . ;;; Code: (require 'dash) (require 'diff) (require 'ediff) (require 'view) ;;;###autoload (defun km/diff () "Run `diff' and then select buffer and turn on View mode." (interactive) (call-interactively #'diff) (select-window (get-buffer-window "*Diff*")) (view-mode 1)) ;;;###autoload (defun km/revert-buffer-and-view () (interactive) (revert-buffer) (view-mode 1)) ;;;###autoload (defun km/ediff-with-other-window () "Run `ediff' on current window's file and other window's file." (interactive) (let ((windows (window-list))) (unless (= (length windows) 2) (user-error "Function restricted to two-window frames")) (-if-let* ((file-a (buffer-file-name (window-buffer (car windows)))) (file-b (buffer-file-name (window-buffer (cadr windows))))) (ediff file-a file-b) (user-error "At least one buffer is not visiting a file")))) (provide 'km-diff) ;;; km-diff.el ends here