[elpa] master 0e10521 31/57: Merge pull request #20 from edkolev/patch-1

branch: master commit 0e105218f167541421018bb61567f975f4ac16b8 Merge: 40ffc92 45666cc Author: Justin Burkett Commit: GitHub Merge pull request #20 from edkolev/patch-1 README: evil-collection adds vimdiff-like bindings --- README.org | 16 +--- 1 file changed, 1 inserti

[elpa] master 09e15fc 51/57: Announce selective sending of changes using the region in README

branch: master commit 09e15fc932bfd2febe1d4a65780a532394562b07 Author: Justin Burkett Commit: Justin Burkett Announce selective sending of changes using the region in README --- README.org | 4 1 file changed, 4 insertions(+) diff --git a/README.org b/README.org index 1389023..724b5e8

[elpa] master e3f5370 37/57: Handle case where full line is not selected in selective send

branch: master commit e3f5370d7b32dabf44f5ceb2d169e75feb17043b Author: Justin Burkett Commit: Justin Burkett Handle case where full line is not selected in selective send --- vdiff.el | 47 --- 1 file changed, 32 insertions(+), 15 deletions(-) di

[elpa] master fd6ec8e 25/57: Test that both buffers are correct by default

branch: master commit fd6ec8e00bdad86e3ead4116da1ce2617346e333 Author: Justin Burkett Commit: Justin Burkett Test that both buffers are correct by default --- vdiff-test.el | 35 ++- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/vdiff-test.e

[elpa] master 90f4b24 52/57: Ensure char-before doesn't cause an error

branch: master commit 90f4b242e1a402dddafccff09e8d161b12416f13 Author: Justin Burkett Commit: Justin Burkett Ensure char-before doesn't cause an error It won't return a number when at the beginning of a buffer. --- vdiff.el | 12 1 file changed, 8 insertions(+), 4 dele

[elpa] master a1a82de 50/57: Merge pull request #25 from justbur/send-region

branch: master commit a1a82dec623a241b0e9ed19fd65da6e7073d59ac Merge: c5e0cb0 0efde18 Author: Justin Burkett Commit: GitHub Merge pull request #25 from justbur/send-region Send region --- vdiff-test.el | 54 + vdiff.el | 153 +++

[elpa] master 745cc02 42/57: Add test for selective send

branch: master commit 745cc02d5786ebe451591d774c699773e8128ade Author: Justin Burkett Commit: Justin Burkett Add test for selective send --- vdiff-test.el | 50 ++ 1 file changed, 50 insertions(+) diff --git a/vdiff-test.el b/vdiff-test.el in

[elpa] master c732247 45/57: Reset truncate-lines on cleanup

branch: master commit c732247f19c56caa32e679633a0d7ae158aab56c Author: Justin Burkett Commit: Justin Burkett Reset truncate-lines on cleanup See #21 --- vdiff.el | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vdiff.el b/vdiff.el index 2c6085d..a6a3130 1

[elpa] master 6878093 33/57: Add vdiff-toggle-fold and vdiff-toggle-all-folds

branch: master commit 687809375f60ece916765003b48b419519551667 Author: Justin Burkett Commit: Justin Burkett Add vdiff-toggle-fold and vdiff-toggle-all-folds Fixes #22 --- vdiff.el | 40 +--- 1 file changed, 33 insertions(+), 7 deletions(-) diff

[elpa] master 58d530b 53/57: Add vdiff-temp-files

branch: master commit 58d530bc30293663761067f17c61660280bfe1ef Author: Justin Burkett Commit: Justin Burkett Add vdiff-temp-files Fixes #26 --- vdiff.el | 12 1 file changed, 12 insertions(+) diff --git a/vdiff.el b/vdiff.el index 29c02a4..eff7363 100644 --- a/vdiff.e

[elpa] master ef899b8 46/57: Reset truncate-lines on cleanup

branch: master commit ef899b82c4df6276306f1a92d6fc5530a82690b4 Author: Justin Burkett Commit: Justin Burkett Reset truncate-lines on cleanup See #21 --- vdiff.el | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vdiff.el b/vdiff.el index 17011fb..226c3ab 1

[elpa] master fe10fb3 44/57: Cleanup some of the transmit addition/changes logic

branch: master commit fe10fb38cda249006219b40eb8a16fb592db Author: Justin Burkett Commit: Justin Burkett Cleanup some of the transmit addition/changes logic --- vdiff.el | 58 -- 1 file changed, 24 insertions(+), 34 deletions(-) d

[elpa] master c0541ae 55/57: Update readme badges

branch: master commit c0541ae9c2cb878be9ab3935da058a72155a14fc Author: Justin Burkett Commit: Justin Burkett Update readme badges --- README.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.org b/README.org index 724b5e8..9fe6523 100644 --- a/README.org +++ b/R

[elpa] master 45923bb 41/57: Fix compiler warnings

branch: master commit 45923bba71a26f4bc6f72837185797cf772f6821 Author: Justin Burkett Commit: Justin Burkett Fix compiler warnings --- vdiff.el | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vdiff.el b/vdiff.el index 9ba59c0..7e568f7 100644 --- a/vdiff.el +++ b/

[elpa] master 185e803 57/57: Merge commit '007e44be19d068fd6b49874b6e9b8df8b1f552bd'

branch: master commit 185e803a97d28e4932fbba9520d6f74fd70dcc87 Merge: 3bfaa7a 007e44b Author: Justin Burkett Commit: Justin Burkett Merge commit '007e44be19d068fd6b49874b6e9b8df8b1f552bd' --- packages/vdiff/.github/workflows/test.yml | 30 ++ packages/vdiff/.gitignore | 9

[elpa] master c5e0cb0 47/57: Update gitignore

branch: master commit c5e0cb0c44a74616930489327619f23ad26445bd Author: Justin Burkett Commit: Justin Burkett Update gitignore --- .gitignore | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 82d13b8..e684078 100644 --- a/.gitignore ++

[elpa] master 68d6ea3 23/57: Make name of vdiff-test consistent with prefixes

branch: master commit 68d6ea37ae73a8a8a44e8400d826b2115eddb952 Author: Justin Burkett Commit: Justin Burkett Make name of vdiff-test consistent with prefixes Introduce macro for setting up testing environment --- Makefile | 2 +- vdiff-test.el | 106 +++

[elpa] master 0efde18 49/57: Improve behavior with respect to region selection

branch: master commit 0efde18364dfe68de129d9bdd29614d4db371f8a Author: Justin Burkett Commit: Justin Burkett Improve behavior with respect to region selection Prefer use-region-p in vdiff--region-or-close-overlay which adds a check for the variable use-empty-active-region.

[elpa] master 69eacfe 18/57: Fix and simplify final newline detection

branch: master commit 69eacfee0eb675ce667d46cc82f1ab679cb9b76f Author: Justin Burkett Commit: Justin Burkett Fix and simplify final newline detection Issue warning if no newline is found. --- vdiff.el | 24 1 file changed, 12 insertions(+), 12 deletions(-)

[elpa] master 007e44b 56/57: Version 0.2.4

branch: master commit 007e44be19d068fd6b49874b6e9b8df8b1f552bd Author: Justin Burkett Commit: Justin Burkett Version 0.2.4 --- vdiff.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdiff.el b/vdiff.el index eff7363..c90c1eb 100644 --- a/vdiff.el +++ b/vdiff.el @@ -5,7

[elpa] master 835485b 13/57: Announce vdiff-diff-algorithm in README

branch: master commit 835485b7f1ce93df19ac90becea363e137669866 Author: Justin Burkett Commit: Justin Burkett Announce vdiff-diff-algorithm in README Addresses #18 --- README.org | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/README.org b/READM

[elpa] master 5b643c7 24/57: Add another send/receive test

branch: master commit 5b643c7839a2130591228862eb130f72e06f2c87 Author: Justin Burkett Commit: Justin Burkett Add another send/receive test --- vdiff-test.el | 23 +++ vdiff.el | 13 + 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/vdiff-

[elpa] master c806fe2 36/57: Allow selective sending in change hunks

branch: master commit c806fe20ce92f1743faf9b1e040937bfb22720f3 Author: Justin Burkett Commit: Justin Burkett Allow selective sending in change hunks --- vdiff.el | 30 -- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/vdiff.el b/vdiff.el index 7cb

[elpa] master 08437d5 48/57: Update gitignore

branch: master commit 08437d5b5ba29e3be9fa08eb202b5d7e3f790ca0 Author: Justin Burkett Commit: Justin Burkett Update gitignore --- .gitignore | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 82d13b8..e684078 100644 --- a/.gitignore ++

[elpa] master 0bfb259 11/57: Add vdiff-debug flag

branch: master commit 0bfb2592f9cd021224ece3e619e70269b6219860 Author: Justin Burkett Commit: Justin Burkett Add vdiff-debug flag --- vdiff.el | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/vdiff.el b/vdiff.el index 3427dc8..01610f6 100644 --- a/vdiff.el +++

[elpa] master b15b020 10/57: Add diff --minimal as algorithm and fix case args for git

branch: master commit b15b02078ebbff312f12afbd792a15f0a9eefe19 Author: Justin Burkett Commit: Justin Burkett Add diff --minimal as algorithm and fix case args for git --- vdiff.el | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/vdiff.el b/vdiff.el index 0

[elpa] master 71b6f40 43/57: Bound target lines in vdiff--transmit-changes

branch: master commit 71b6f40ade4abde88324149b161d40cdc6c53faa Author: Justin Burkett Commit: Justin Burkett Bound target lines in vdiff--transmit-changes --- vdiff.el | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/vdiff.el b/vdiff.el index 7e568f7..7a01aec

[elpa] master 02309fc 38/57: Retain buffer identities in line maps

branch: master commit 02309fc5a212e8f7a507d97bc4b8d4cee90e10d5 Author: Justin Burkett Commit: Justin Burkett Retain buffer identities in line maps Allows for the return value of vdiff--translate-line to be more explicit --- vdiff.el | 32 1 file cha

[elpa] master 52b7e04 04/57: Switch to using unified diff output (diff -u)

branch: master commit 52b7e042cb2a1efc60ad4f3d8000a74342b87363 Author: Justin Burkett Commit: Justin Burkett Switch to using unified diff output (diff -u) Makes it easier to plug in different algorithms from git diff for example. See #18 --- vdiff.el | 73 +

[elpa] master 0312ac8 06/57: Update copyright years

branch: master commit 0312ac8ccd456f670d6e6c4b8478c9656463b92a Author: Justin Burkett Commit: Justin Burkett Update copyright years --- vdiff.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdiff.el b/vdiff.el index 700f311..88c954c 100644 --- a/vdiff.el +++ b/vdiff.e

[elpa] master 3bfb5de 32/57: Truncate long lines by default

branch: master commit 3bfb5decd7fcef73759b247b29aeae669fb79499 Author: Justin Burkett Commit: Justin Burkett Truncate long lines by default Adds vdiff-truncate-lines to control the behavior. Fixes #21 --- vdiff.el | 31 --- 1 file changed, 16 in

[elpa] master 61d29bb 54/57: Travis -> github workflow

branch: master commit 61d29bbaba8a312c75e78edae1d0047d7eae4473 Author: Justin Burkett Commit: Justin Burkett Travis -> github workflow --- .github/workflows/test.yml | 30 ++ .travis.yml| 25 - 2 files changed, 30 insertion

[elpa] master bc5e1a7 07/57: Remove debugging message

branch: master commit bc5e1a78dc159bb06f8b80667c75f4cb37bab201 Author: Justin Burkett Commit: Justin Burkett Remove debugging message --- vdiff.el | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/vdiff.el b/vdiff.el index 88c954c..ebab055 100644 --- a/vdiff.el +++

[elpa] master ccc773b 39/57: Add optional to-buffer arg to vdiff--translate line

branch: master commit ccc773b14c6c1b9742a3b3608b27a1e22406ac93 Author: Justin Burkett Commit: Justin Burkett Add optional to-buffer arg to vdiff--translate line --- vdiff.el | 22 ++ 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/vdiff.el b/vdiff.el index

[elpa] master c1525a8 05/57: Fix problems with diff -u parser at beg and end of file

branch: master commit c1525a86618fc89904d399e5cecb3c435fe1211b Author: Justin Burkett Commit: Justin Burkett Fix problems with diff -u parser at beg and end of file Add a test as well. --- vdiff-tests.el | 60 ++ vdiff.el

[elpa] master 41c2d0a 02/57: Handle error when no overlay at point

branch: master commit 41c2d0a157e739725c478aeb77de51f4d83bf569 Author: Justin Burkett Commit: Justin Burkett Handle error when no overlay at point * vdiff.el (vdiff--overlay-at-pos): Throw user-error when no overlay is found. --- vdiff.el | 30 +++--- 1 fil

[elpa] master 66ae1ac 03/57: README: Note new option

branch: master commit 66ae1ac324d9ec7ef87abee38f260734f036cf3d Author: Justin Burkett Commit: Justin Burkett README: Note new option --- README.org | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.org b/README.org index 2d30c9e..9e536d9 100644 --- a/README.org +++ b/README.org

[elpa] master 6c3731a 40/57: Fixup vdiff--transmit-change for 3way diffs

branch: master commit 6c3731a8a4179ecdd773cbd7f7cbaf36c48287c2 Author: Justin Burkett Commit: Justin Burkett Fixup vdiff--transmit-change for 3way diffs --- vdiff.el | 44 +--- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/vdiff.el b

[elpa] master 773e3eb 28/57: Fix compiler warnings

branch: master commit 773e3ebde452cec9b37baa0d425ec4b51d9dc563 Author: Justin Burkett Commit: Justin Burkett Fix compiler warnings --- vdiff.el | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/vdiff.el b/vdiff.el index e636a91..57e75ca 100644 --- a/vdiff.el +++ b/vd

[elpa] master 106a69f 20/57: Fix previous tests for Travis

branch: master commit 106a69fcf02b172be988579e65ecb5e80eb26db9 Author: Justin Burkett Commit: Justin Burkett Fix previous tests for Travis --- vdiff-tests.el | 18 +++- vdiff.el | 142 +++-- 2 files changed, 83 insertions(+), 77

[elpa] master fb21cc6 08/57: Fix parsing of subtractions in diff -u

branch: master commit fb21cc64533d1e90cd40367b957eacfce5922327 Author: Justin Burkett Commit: Justin Burkett Fix parsing of subtractions in diff -u --- vdiff.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdiff.el b/vdiff.el index ebab055..f9a9a19 100644 --- a/vdiff.

[elpa] master 45f7019 19/57: Add basic send and receive tests

branch: master commit 45f7019c6c42aa594553324f05344528f8e625e8 Author: Justin Burkett Commit: Justin Burkett Add basic send and receive tests Refactor vdiff-refresh to allow for synchronous parsing to use for testing. --- vdiff-tests.el | 116 +++

[elpa] master bd8976e 26/57: Add movement and setup tests

branch: master commit bd8976efc6c0fa5343d210467dd02f8bb474a182 Author: Justin Burkett Commit: Justin Burkett Add movement and setup tests --- vdiff-test.el | 23 +++ 1 file changed, 23 insertions(+) diff --git a/vdiff-test.el b/vdiff-test.el index fa03a3f..9172990 10064

[elpa] master 4cc1ee5 35/57: Allow sending selective regions from additions

branch: master commit 4cc1ee50c44e8734b9f547b85c13ba7f3cf871e2 Author: Justin Burkett Commit: Justin Burkett Allow sending selective regions from additions --- vdiff.el | 64 +++- 1 file changed, 43 insertions(+), 21 deletions(-)

[elpa] master c803bd6 17/57: Add warnings for obsolete variables

branch: master commit c803bd61c32ab3d2adf0a157a99a6b8985640f97 Author: Justin Burkett Commit: Justin Burkett Add warnings for obsolete variables --- vdiff.el | 5 + 1 file changed, 5 insertions(+) diff --git a/vdiff.el b/vdiff.el index 0e71a38..d8cf976 100644 --- a/vdiff.el +++ b/vdiff

[elpa] master f0de403 21/57: Add emacs-26.1 for Travis

branch: master commit f0de40379934b7c5762bc5a8d45f0583978cd8fd Author: Justin Burkett Commit: Justin Burkett Add emacs-26.1 for Travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index cfe9029..03f0d96 100644 --- a/.travis.yml +++ b/.travis.

[elpa] master 45666cc 30/57: README: evil-collection adds vimdiff-like bindings

branch: master commit 45666cc77506bb06d9a0004da4e0b3fc4a8ee507 Author: Evgeni Kolev Commit: Evgeni Kolev 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 71348

[elpa] master 8f3fa10 15/57: Fix Makefile typo

branch: master commit 8f3fa10227a502001f8fca440c456fe5438e9575 Author: Justin Burkett Commit: Justin Burkett Fix Makefile typo --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0780a20..4e3a180 100644 --- a/Makefile +++ b/Makefile @@

[elpa] master 5667bc6 16/57: Ensure input files to diff end in newline

branch: master commit 5667bc6204086f129292122e6b1b08e9a93906a1 Author: Justin Burkett Commit: Justin Burkett Ensure input files to diff end in newline --- vdiff.el | 21 ++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/vdiff.el b/vdiff.el index 69bde38..0

[elpa] master af74300 01/57: Add vdiff-disable-folding user option

branch: master commit af74300410d5c980056498db42aa8eb79f6f7826 Author: Justin Burkett Commit: Justin Burkett Add vdiff-disable-folding user option * vdiff.el (vdiff-disable-folding): Add (vdiff--refresh-overlays): Update --- vdiff.el | 7 ++- 1 file changed, 6 insertions(+)

[elpa] master f2a622f 34/57: Improve vdiff-toggle-fold

branch: master commit f2a622f46e7a84389972b86c8dbc778a6d890ddf Author: Justin Burkett Commit: Justin Burkett Improve vdiff-toggle-fold --- vdiff.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vdiff.el b/vdiff.el index d528d15..17011fb 100644 --- a/vdiff.el +++ b/vd

[elpa] master 348d1a7 27/57: Add after-quit arg to vdiff-test-with-buffers

branch: master commit 348d1a78d217603daebaf2db75f6802cdd435138 Author: Justin Burkett Commit: Justin Burkett Add after-quit arg to vdiff-test-with-buffers --- vdiff-test.el | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vdiff-test.el b/vdiff-test.el index 91729

[elpa] master eb553fa 09/57: Add support for different diff algorithms

branch: master commit eb553facd7b66cf3c108e68a3d96be4a5bcc0b83 Author: Justin Burkett Commit: Justin Burkett Add support for different diff algorithms Replace vdiff-diff-{program,extra-args} with vdiff-diff-algorithm{s}, which allows for selection of pre-specified commands that

[elpa] master 5f7d3fd 22/57: Add Travis badge

branch: master commit 5f7d3fd09e257b0ee01dc13de93a6a02d209b183 Author: Justin Burkett Commit: Justin Burkett Add Travis badge --- README.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.org b/README.org index 24e1999..713487e 100644 --- a/README.org +++ b/READM

[elpa] master updated (3bfaa7a -> 185e803)

justbur pushed a change to branch master. from 3bfaa7a Really fix typo in previous debbugs-gnu change new af74300 Add vdiff-disable-folding user option new 41c2d0a Handle error when no overlay at point new 66ae1ac README: Note new option new 52b7e04

[elpa] master 40ffc92 29/57: Warn on bad initialization of vdiff session.

branch: master commit 40ffc92c566b55264f48167a02c17518743870b4 Author: Justin Burkett Commit: Justin Burkett Warn on bad initialization of vdiff session. Ref #19 --- vdiff.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vdiff.el b/vdiff.el index 57e75ca..84ad0b4 100644 --

[elpa] master 992d07b 14/57: Add travis support

branch: master commit 992d07b29bf0f1b3403fa35f3badd79e676990e6 Author: Justin Burkett Commit: Justin Burkett Add travis support --- .travis.yml | 24 Cask| 7 +++ Makefile| 19 +++ 3 files changed, 50 insertions(+) diff --git a/.tra

[elpa] master 110d672 12/57: Cleanup diff parsing function

branch: master commit 110d6726bc2f0c6a7c589fb59de8001ad9477950 Author: Justin Burkett Commit: Justin Burkett Cleanup diff parsing function --- vdiff.el | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/vdiff.el b/vdiff.el index 01610f6..69bde38 100644 -