[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 0e10521 31/57: Merge pull request #20 from edkolev/patch-1
From: |
Justin Burkett |
Subject: |
[elpa] master 0e10521 31/57: Merge pull request #20 from edkolev/patch-1 |
Date: |
Tue, 3 Nov 2020 14:32:22 -0500 (EST) |
branch: master
commit 0e105218f167541421018bb61567f975f4ac16b8
Merge: 40ffc92 45666cc
Author: Justin Burkett <justin@burkett.cc>
Commit: GitHub <noreply@github.com>
Merge pull request #20 from edkolev/patch-1
README: evil-collection adds vimdiff-like bindings
---
README.org | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/README.org b/README.org
index 713487e..1389023 100644
--- a/README.org
+++ b/README.org
@@ -139,21 +139,7 @@ prefix in normal state.
(evil-define-key 'normal vdiff-mode-map "," vdiff-mode-prefix-map)
#+END_SRC
-To match vimdiff bindings some more work is required. The way the =d= command
-for evil is set up makes it difficult to bind =do= and =dp= as they exist in
-vimdiff. Here is a sample set of bindings that avoids this problem (thanks to
-@edkolev for these).
-
-#+BEGIN_SRC emacs-lisp
- (evil-define-minor-mode-key 'normal 'vdiff-mode "]c" 'vdiff-next-hunk)
- (evil-define-minor-mode-key 'normal 'vdiff-mode "[c" 'vdiff-previous-hunk)
- (evil-define-minor-mode-key 'normal 'vdiff-mode "zc" 'vdiff-close-fold)
- (evil-define-minor-mode-key 'normal 'vdiff-mode "zM" 'vdiff-close-all-folds)
- (evil-define-minor-mode-key 'normal 'vdiff-mode "zo" 'vdiff-open-fold)
- (evil-define-minor-mode-key 'normal 'vdiff-mode "zR" 'vdiff-open-all-folds)
- (evil-define-minor-mode-key 'motion 'vdiff-mode "go" 'vdiff-receive-changes)
- (evil-define-minor-mode-key 'motion 'vdiff-mode "gp" 'vdiff-send-changes)
-#+END_SRC
+vimdiff-like binding are provided by
[[https://github.com/emacs-evil/evil-collection][evil-collection]]'s
[[https://github.com/emacs-evil/evil-collection/blob/master/evil-collection-vdiff.el][evil-collection-vdiff.el]]
** Hydra
- [elpa] master ccc773b 39/57: Add optional to-buffer arg to vdiff--translate line, (continued)
- [elpa] master ccc773b 39/57: Add optional to-buffer arg to vdiff--translate line, Justin Burkett, 2020/11/03
- [elpa] master 58d530b 53/57: Add vdiff-temp-files, Justin Burkett, 2020/11/03
- [elpa] master c732247 45/57: Reset truncate-lines on cleanup, Justin Burkett, 2020/11/03
- [elpa] master 61d29bb 54/57: Travis -> github workflow, Justin Burkett, 2020/11/03
- [elpa] master eb553fa 09/57: Add support for different diff algorithms, Justin Burkett, 2020/11/03
- [elpa] master 8f3fa10 15/57: Fix Makefile typo, Justin Burkett, 2020/11/03
- [elpa] master 5667bc6 16/57: Ensure input files to diff end in newline, Justin Burkett, 2020/11/03
- [elpa] master 110d672 12/57: Cleanup diff parsing function, Justin Burkett, 2020/11/03
- [elpa] master bd8976e 26/57: Add movement and setup tests, Justin Burkett, 2020/11/03
- [elpa] master 40ffc92 29/57: Warn on bad initialization of vdiff session., Justin Burkett, 2020/11/03
- [elpa] master 0e10521 31/57: Merge pull request #20 from edkolev/patch-1,
Justin Burkett <=
- [elpa] master f2a622f 34/57: Improve vdiff-toggle-fold, Justin Burkett, 2020/11/03
- [elpa] master 45f7019 19/57: Add basic send and receive tests, Justin Burkett, 2020/11/03
- [elpa] master 773e3eb 28/57: Fix compiler warnings, Justin Burkett, 2020/11/03
- [elpa] master 3bfb5de 32/57: Truncate long lines by default, Justin Burkett, 2020/11/03
- [elpa] master c806fe2 36/57: Allow selective sending in change hunks, Justin Burkett, 2020/11/03
- [elpa] master 007e44b 56/57: Version 0.2.4, Justin Burkett, 2020/11/03
- [elpa] master 69eacfe 18/57: Fix and simplify final newline detection, Justin Burkett, 2020/11/03
- [elpa] master 68d6ea3 23/57: Make name of vdiff-test consistent with prefixes, Justin Burkett, 2020/11/03
- [elpa] master e3f5370 37/57: Handle case where full line is not selected in selective send, Justin Burkett, 2020/11/03
- [elpa] master 6c3731a 40/57: Fixup vdiff--transmit-change for 3way diffs, Justin Burkett, 2020/11/03