[elpa] scratch/add-vdiff 12f4a21 042/258: Add quit command

[Justin Burkett]

branch: scratch/add-vdiff
commit 12f4a21dfcf608869043200ae6f3e638cfa6f25c
Author: justbur <address@hidden>
Commit: justbur <address@hidden>

    Add quit command
---
 README.org | 11 ++++++-----
 vdiff.el   |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/README.org b/README.org
index ee33184..6b67c68 100644
--- a/README.org
+++ b/README.org
@@ -46,16 +46,17 @@ declaration the key bindings in vdiff buffers are
 
 | Key     | Command                         | Description                      
                  |
 
|---------+---------------------------------+----------------------------------------------------|
+| =C-c g= | =vdiff-goto-corresponding-line= | Jump to the corresponding line 
in the other buffer |
 | =C-c n= | =vdiff-next-change=             | Move to next change in buffer    
                  |
 | =C-c p= | =vdiff-previous-change=         | Move to previous change in 
buffer                  |
-| =C-c g= | =vdiff-goto-corresponding-line= | Jump to the corresponding line 
in the other buffer |
-| =C-c s= | =vdiff-send-changes=            | Send this hunk (or all in 
region) to other buffer  |
 | =C-c r= | =vdiff-receive-changes=         | Receive the corresponding hunk 
from other buffer   |
-| =C-c w= | =vdiff-save-buffers=            | Save both buffers                
                  |
-| =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 s= | =vdiff-send-changes=            | Send this hunk (or all in 
region) to other 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 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 current 
line              |
 
 To start vdiff, use either =vdiff-files= to select two files or =vdiff-buffers=
diff --git a/vdiff.el b/vdiff.el
index 12cc530..421bb98 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -892,6 +892,7 @@ asked to select two buffers."
   (interactive)
   (dolist (buf vdiff--buffers)
     (vdiff-mode -1)))
+(defalias 'vdiff-quit 'vdiff-exit)
 
 (defvar vdiff-mode-map
   (let ((map (make-sparse-keymap)))
@@ -905,6 +906,7 @@ asked to select two buffers."
     (define-key map "p" 'vdiff-previous-change)
     (define-key map "s" 'vdiff-send-changes)
     (define-key map "r" 'vdiff-receive-changes)
+    (define-key map "q" 'vdiff-quit)
     (define-key map "w" 'vdiff-save-buffers)
     (define-key map "o" 'vdiff-open-fold)
     (define-key map "O" 'vdiff-open-all-folds)