;;; evil-collection-vdiff.el --- Evil bindings for vdiff -*- lexical-binding: t -*- ;; Copyright (C) 2017 Pierre Neidhardt ;; Author: Evgeni Kolev ;; Maintainer: James Nguyen ;; Pierre Neidhardt ;; URL: https://github.com/emacs-evil/evil-collection ;; Version: 0.0.1 ;; Package-Requires: ((emacs "25.1")) ;; 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 . ;;; Commentary: ;; Evil bindings for vdiff.el https://github.com/justbur/emacs-vdiff ;;; Code: (require 'vdiff nil t) (require 'evil-collection) (defun evil-collection-vdiff-setup () "Set up `evil' bindings for `vdiff-mode'." (dolist (mode '(vdiff-mode vdiff-3way-mode)) (evil-define-minor-mode-key 'normal mode "]c" 'vdiff-next-hunk "[c" 'vdiff-previous-hunk) ;; define `do' (diff obtain) and `dp' (diff put) bindings (evil-define-minor-mode-key 'operator mode "o" '(menu-item "" nil :filter (lambda (&optional _) (when (memq evil-this-operator evil-collection-delete-operators) #'vdiff-receive-changes))) "p" '(menu-item "" nil :filter (lambda (&optional _) (when (memq evil-this-operator evil-collection-delete-operators) #'vdiff-send-changes)))))) (provide 'evil-collection-vdiff) ;;; evil-collection-vdiff.el ends here