[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff fa6391e 123/258: Reorg README commands section
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff fa6391e 123/258: Reorg README commands section |
Date: |
Wed, 17 May 2017 08:13:36 -0400 (EDT) |
branch: scratch/add-vdiff
commit fa6391e6379372da69d0fa8c5394756e69ac2795
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Reorg README commands section
---
README.org | 64 ++++++++++++++++++++++++++++++++++++++++++--------------------
1 file changed, 44 insertions(+), 20 deletions(-)
diff --git a/README.org b/README.org
index 80993df..7a57305 100644
--- a/README.org
+++ b/README.org
@@ -43,26 +43,50 @@ which will bind most of the commands under the =C-c= prefix
when vdiff-mode is
active. Of course you can pick whatever prefix you prefer. With the =C-c=
prefix
the commands would be
-| Key | Command | Description |
-|---------+---------------------------+-------------------------------------|
-| =C-c g= | =vdiff-switch-buffer= | Switch buffers at matching line |
-| =C-c n= | =vdiff-next-hunk= | Move to next hunk in buffer |
-| =C-c p= | =vdiff-previous-hunk= | Move to previous hunk in buffer |
-| =C-c N= | =vdiff-next-fold= | Move to next fold in buffer |
-| =C-c P= | =vdiff-previous-fold= | Move to previous fold in buffer |
-| =C-c r= | =vdiff-receive-changes= | Receive change from other buffer |
-| =C-c s= | =vdiff-send-changes= | Send this change(s) to other buffer |
-| =C-c f= | =vdiff-refine-this-hunk= | Highlight changed words in hunk |
-| =C-c F= | =vdiff-refine-all-hunks= | Highlight changed words in hunk |
-| =C-c c= | =vdiff-close-fold= | Close fold at point or in region |
-| =C-c C= | =vdiff-close-all-folds= | Close all folds in buffer |
-| =C-c t= | =vdiff-close-other-folds= | Close all other folds in buffer |
-| =C-c o= | =vdiff-open-fold= | Open fold at point or in region |
-| =C-c O= | =vdiff-open-all-folds= | Open all folds in buffer |
-| =C-c w= | =vdiff-save-buffers= | Save both buffers |
-| =C-c q= | =vdiff-quit= | Quit vdiff |
-| =C-l= | =vdiff-sync-and-center= | Recenter both buffers at this line |
-| =C-c h= | =vdiff-maybe-hydra= | Enter vdiff-hydra if defined |
+*** Basics
+
+| Key | Command | Description
|
+|---------+------------------------------------+-------------------------------------|
+| =C-c g= | =vdiff-switch-buffer= | Switch buffers at matching
line |
+| =C-c n= | =vdiff-next-hunk= | Move to next hunk in buffer
|
+| =C-c p= | =vdiff-previous-hunk= | Move to previous hunk in
buffer |
+| =C-c h= | =vdiff-maybe-hydra= | Enter vdiff-hydra if defined
|
+| =C-l= | =vdiff-sync-and-center= | Recenter both buffers at this
line |
+
+*** Viewing and Transmitting Changes Between Buffers
+
+| Key | Command | Description
|
+|---------+------------------------------------+-------------------------------------|
+| =C-c r= | =vdiff-receive-changes= | Receive change from other
buffer |
+| =C-c s= | =vdiff-send-changes= | Send this change(s) to other
buffer |
+| =C-c f= | =vdiff-refine-this-hunk= | Highlight changed words in
hunk |
+| =C-c x= | =vdiff-remove-refinements-in-hunk= | Remove refinement
highlighting |
+| (none) | =vdiff-refine-this-hunk-symbol= | Refine based on symbols
|
+| (none) | =vdiff-refine-this-hunk-word= | Refine based on words
|
+| =C-c F= | =vdiff-refine-all-hunks= | Highlight changed words
|
+| (none) | =vdiff-refine-all-hunks-symbol= | Refine all based on symbols
|
+| (none) | =vdiff-refine-all-hunks-word= | Refine all based on words
|
+
+*** Folds
+
+| Key | Command | Description
|
+|---------+------------------------------------+-------------------------------------|
+| =C-c N= | =vdiff-next-fold= | Move to next fold in buffer
|
+| =C-c P= | =vdiff-previous-fold= | Move to previous fold in
buffer |
+| =C-c c= | =vdiff-close-fold= | Close fold at point or in
region |
+| =C-c C= | =vdiff-close-all-folds= | Close all folds in buffer
|
+| =C-c t= | =vdiff-close-other-folds= | Close all other folds in
buffer |
+| =C-c o= | =vdiff-open-fold= | Open fold at point or in
region |
+| =C-c O= | =vdiff-open-all-folds= | Open all folds in buffer
|
+
+*** Saving, Updating and Exiting
+
+| Key | Command | Description |
+|---------+-------------------------+------------------------------|
+| =C-c w= | =vdiff-save-buffers= | Save both buffers |
+| =C-c u= | =vdiff-refresh= | Force diff refresh |
+| (none) | =vdiff-restore-windows= | Restore window configuration |
+| =C-c q= | =vdiff-quit= | Quit vdiff |
Evil-mode users might prefer something like the following to use =,= as a
prefix
in normal state.
- [elpa] scratch/add-vdiff ad37c86 009/258: Factor out subtraction overlay and prefix internal vars, (continued)
- [elpa] scratch/add-vdiff ad37c86 009/258: Factor out subtraction overlay and prefix internal vars, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 04f5436 001/258: Initial commit, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f54616f 039/258: Don't close folds if all are open, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f77f184 062/258: Fix alignment of folds problem caused by recent change, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f2aaa2e 067/258: Fix goto-corresponding-line, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 9a748df 065/258: Update README, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 9b4e829 069/258: Update requirements for vdiff-hydra, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d6a399f 076/258: Annouce exit, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 43b9dc6 097/258: Add missing image, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7811f01 095/258: Add two features, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff fa6391e 123/258: Reorg README commands section,
Justin Burkett <=
- [elpa] scratch/add-vdiff a2fbb7b 146/258: Rename diff-program-args, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 3d38f6c 040/258: Fix line endings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 5031c90 145/258: Finish new line translation logic, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 8c78e58 170/258: Fix compiler warning, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 9890b81 181/258: Fix weird vscroll problem, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 9454053 187/258: Use window-text-width instead of window-width, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e6e834f 196/258: Don't refresh on buffer switch, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 5043ca3 168/258: Wrap global state into session object, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff af5ddce 203/258: Remove vdiff-sync-and-center, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7f100a3 210/258: Fix vdiff-refresh callback function, Justin Burkett, 2017/05/17