aboutsummaryrefslogtreecommitdiff
path: root/.config/emacs/lisp/evil-collection/modes/vdiff/evil-collection-vdiff.el
diff options
context:
space:
mode:
authorJack Jamison <jackqjamison@gmail.com>2026-07-30 20:09:00 -0400
committerJack Jamison <jackqjamison@gmail.com>2026-07-30 20:18:37 -0400
commit8c4e09dff83847ac7f07bf1da7751e9328006c4d (patch)
treea0e245567ce225f8bcb63b66e4d2373b5d033e4a /.config/emacs/lisp/evil-collection/modes/vdiff/evil-collection-vdiff.el
parent1e33b30749bb1043ffc6ceb5a2fb0977446788b3 (diff)
actual final changes and get rid of junk in lisp dir
actually works fine
Diffstat (limited to '.config/emacs/lisp/evil-collection/modes/vdiff/evil-collection-vdiff.el')
-rw-r--r--.config/emacs/lisp/evil-collection/modes/vdiff/evil-collection-vdiff.el54
1 files changed, 0 insertions, 54 deletions
diff --git a/.config/emacs/lisp/evil-collection/modes/vdiff/evil-collection-vdiff.el b/.config/emacs/lisp/evil-collection/modes/vdiff/evil-collection-vdiff.el
deleted file mode 100644
index 393061a..0000000
--- a/.config/emacs/lisp/evil-collection/modes/vdiff/evil-collection-vdiff.el
+++ /dev/null
@@ -1,54 +0,0 @@
-;;; evil-collection-vdiff.el --- Evil bindings for vdiff -*- lexical-binding: t -*-
-
-;; Copyright (C) 2017 Pierre Neidhardt
-
-;; Author: Evgeni Kolev <evgenysw@gmail.com>
-;; Maintainer: James Nguyen <james@jojojames.com>
-;; Pierre Neidhardt <mail@ambrevar.xyz>
-;; URL: https://github.com/emacs-evil/evil-collection
-;; Version: 0.0.1
-;; Package-Requires: ((emacs "26.3"))
-;; Keywords: evil, vdiff, tools
-
-;; This file 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, or (at your
-;; option) any later version.
-;;
-;; This file 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.
-;;
-;; For a full copy of the GNU General Public License
-;; see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;; Evil bindings for vdiff.el https://github.com/justbur/emacs-vdiff
-
-;;; Code:
-(require 'vdiff nil t)
-(require 'evil-collection)
-
-(defconst evil-collection-vdiff-maps '(vdiff-mode-map
- vdiff-3way-mode-map))
-
-;;;###autoload
-(defun evil-collection-vdiff-setup ()
- "Set up `evil' bindings for `vdiff-mode'."
- (add-hook 'vdiff-mode-hook 'evil-normalize-keymaps)
- (add-hook 'vdiff-3way-mode-hook 'evil-normalize-keymaps)
-
- (dolist (keymap evil-collection-vdiff-maps)
- (evil-collection-define-key 'normal keymap
- "]c" 'vdiff-next-hunk
- "[c" 'vdiff-previous-hunk)
-
- ;; define `do' (diff obtain) and `dp' (diff put) bindings
- (evil-collection-define-operator-key 'delete keymap
- "o" 'vdiff-receive-changes
- "p" 'vdiff-send-changes)))
-
-(provide 'evil-collection-vdiff)
-
-;;; evil-collection-vdiff.el ends here