blob: 9c2b143f7e6bca639ba809fecb08daf48f5deb5f (
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
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
|
;;; km-diff.el --- Diff-related extensions
;; Copyright (C) 2012-2016 Kyle Meyer <kyle@kyleam.com>
;; Author: Kyle Meyer <kyle@kyleam.com>
;; 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 <http://www.gnu.org/licenses/>.
;;; Code:
(require 'dash)
(require 'diff)
(require 'ediff)
;;;###autoload
(defun km/diff-lock-buffer ()
"Rename current diff buffer to include new file name."
(interactive)
(rename-buffer
(format "*Diff: %s*"
(abbreviate-file-name
(substring-no-properties (diff-find-file-name))))))
;;;###autoload
(defun km/diff-current-buffer-with-file ()
"Like `diff-buffer-with-file', but use current buffer without prompting."
(interactive)
(unless (buffer-file-name)
(user-error "Buffer isn't associated with a file"))
(diff-buffer-with-file (current-buffer)))
(defun km/diff--with-other-window (diff-func)
(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)))))
(funcall diff-func file-a file-b)
(user-error "At least one buffer is not visiting a file"))))
;;;###autoload
(defun km/diff-with-other-window ()
"Run `diff' on current window's file and other window's file."
(interactive)
(km/diff--with-other-window #'diff))
;;;###autoload
(defun km/ediff-with-other-window ()
"Run `ediff' on current window's file and other window's file."
(interactive)
(km/diff--with-other-window #'ediff))
(defvar km/ediff-previous-window-config nil)
;;;###autoload
(defun km/ediff-save-window-config ()
(setq km/ediff-previous-window-config (current-window-configuration)))
;;;###autoload
(defun km/ediff-restore-window-config ()
(when km/ediff-previous-window-config
(set-window-configuration km/ediff-previous-window-config)
(setq km/ediff-previous-window-config nil)))
(provide 'km-diff)
;;; km-diff.el ends here
|