[elpa] master 704d986 4/4: Merge commit 'f55acdbfcbb14e463d0850cfd041614c7002669e'

[Justin Burkett]

branch: master
commit 704d9864576902526c7829852748abec084e3605
Merge: 61fd27e f55acdb
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>

    Merge commit 'f55acdbfcbb14e463d0850cfd041614c7002669e'
---
 packages/vdiff/README.org | 16 +++++++++-------
 packages/vdiff/vdiff.el   |  3 +--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/vdiff/README.org b/packages/vdiff/README.org
index 1ba7494..2d30c9e 100644
--- a/packages/vdiff/README.org
+++ b/packages/vdiff/README.org
@@ -5,13 +5,13 @@
 A tool like vimdiff for Emacs 
 
 ** Table of Contents                                                    :TOC:
- - [[#vdiff][vdiff]]
-   - [[#introduction][Introduction]]
-   - [[#recent-significant-changes][Recent (Significant) Changes]]
-   - [[#screenshot][Screenshot]]
-   - [[#installation-and-usage][Installation and Usage]]
-   - [[#hydra][Hydra]]
-   - [[#further-customization][Further customization]]
+- [[#vdiff][vdiff]]
+  - [[#introduction][Introduction]]
+  - [[#recent-significant-changes][Recent (Significant) Changes]]
+  - [[#screenshot][Screenshot]]
+  - [[#installation-and-usage][Installation and Usage]]
+  - [[#hydra][Hydra]]
+  - [[#further-customization][Further customization]]
 
 ** Introduction
 
@@ -89,7 +89,9 @@ the commands would be
 | Key     | Command                            | Description                   
      |
 
|---------+------------------------------------+-------------------------------------|
 | =C-c r= | =vdiff-receive-changes=            | Receive change from other 
buffer    |
+| =C-c R= | =vdiff-receive-changes-and-step=   | Same as =C-c r= then =C-c n=  
      |
 | =C-c s= | =vdiff-send-changes=               | Send this change(s) to other 
buffer |
+| =C-c S= | =vdiff-send-changes-and-step=      | Same as =C-c s= then =C-c n=  
      |
 | =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       
      |
diff --git a/packages/vdiff/vdiff.el b/packages/vdiff/vdiff.el
index c17023a..b302f86 100644
--- a/packages/vdiff/vdiff.el
+++ b/packages/vdiff/vdiff.el
@@ -5,7 +5,7 @@
 ;; Author: Justin Burkett <address@hidden>
 ;; Maintainer: Justin Burkett <address@hidden>
 ;; URL: https://github.com/justbur/emacs-vdiff
-;; Version: 0.2
+;; Version: 0.2.2
 ;; Keywords: diff
 ;; Package-Requires: ((emacs "24.4") (hydra "0.13.0"))
 
@@ -1428,7 +1428,6 @@ buffer)."
              (2-scroll (nth 3 2-scroll-data))
              ;; 1 is short for this; 2 is the first other and 3 is the second
              (vdiff--in-scroll-hook t))
-        (message "%s" 2-scroll-data)
         (when (and 2-pos 2-start-pos)
           (set-window-point 2-win 2-pos)
           ;; For some reason without this unless the vscroll gets eff'd