]> git.ipfire.org Git - thirdparty/vim.git/commit
patch 9.1.1009: diff feature can be improved v9.1.1009
authorJonathon <jonathonwhite@protonmail.com>
Sun, 12 Jan 2025 08:58:00 +0000 (09:58 +0100)
committerChristian Brabandt <cb@256bit.org>
Sun, 12 Jan 2025 08:58:00 +0000 (09:58 +0100)
commit7c7a4e6d1ad50d5b25b42aa2d5a33a8d04a4cc8a
tree932f9901f5f8a8491bd0d62e3438085a4e0f0bac
parentfaf250c9e4f6f9fa5db38d9373735e77ba438a90
patch 9.1.1009: diff feature can be improved

Problem:  diff feature can be improved
Solution: include the linematch diff alignment algorithm
          (Jonathon)

closes: #9661

Signed-off-by: Jonathon <jonathonwhite@protonmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
53 files changed:
Filelist
runtime/doc/options.txt
runtime/doc/version9.txt
src/Make_ami.mak
src/Make_cyg_ming.mak
src/Make_mvc.mak
src/Make_vms.mms
src/Makefile
src/diff.c
src/drawline.c
src/globals.h
src/linematch.c [new file with mode: 0644]
src/proto.h
src/proto/diff.pro
src/proto/linematch.pro [new file with mode: 0644]
src/proto/strings.pro
src/strings.c
src/structs.h
src/testdir/dumps/Test_diff_23.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_24.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_get_put_linematch_1.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_get_put_linematch_10.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_get_put_linematch_11.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_get_put_linematch_12.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_get_put_linematch_13.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_get_put_linematch_14.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_get_put_linematch_15.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_get_put_linematch_16.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_get_put_linematch_17.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_get_put_linematch_18.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_get_put_linematch_19.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_get_put_linematch_2.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_get_put_linematch_3.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_get_put_linematch_4.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_get_put_linematch_5.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_get_put_linematch_6.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_get_put_linematch_7.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_get_put_linematch_8.dump [new file with mode: 0644]
src/testdir/dumps/Test_diff_get_put_linematch_9.dump [new file with mode: 0644]
src/testdir/dumps/Test_linematch_3diffs1.dump [new file with mode: 0644]
src/testdir/dumps/Test_linematch_diff1.dump [new file with mode: 0644]
src/testdir/dumps/Test_linematch_diff_grouping1.dump [new file with mode: 0644]
src/testdir/dumps/Test_linematch_diff_grouping2.dump [new file with mode: 0644]
src/testdir/dumps/Test_linematch_diff_grouping_scroll0.dump [new file with mode: 0644]
src/testdir/dumps/Test_linematch_diff_grouping_scroll1.dump [new file with mode: 0644]
src/testdir/dumps/Test_linematch_diff_grouping_scroll2.dump [new file with mode: 0644]
src/testdir/dumps/Test_linematch_diff_iwhite1.dump [new file with mode: 0644]
src/testdir/dumps/Test_linematch_diff_iwhite2.dump [new file with mode: 0644]
src/testdir/dumps/Test_linematch_line_limit_exceeded1.dump [new file with mode: 0644]
src/testdir/dumps/Test_linematch_line_limit_exceeded2.dump [new file with mode: 0644]
src/testdir/test_diffmode.vim
src/version.c
src/vim.h