aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/testdir/test_diffmode.vim
Commit message (Collapse)AuthorAge
* test: move oldtests to test directory (#22536)dundargoc2023-03-07
| | | | | The new oldtest directory is in test/old/testdir. The reason for this is that many tests have hardcoded the parent directory name to be 'testdir'.
* vim-patch:8.2.3900: it is not easy to use a script-local function for an optionzeertzjq2022-12-03
| | | | | | | | | | | | | Problem: It is not easy to use a script-local function for an option. Solution: recognize s: and <SID> at the start of the expression. (Yegappan Lakshmanan, closes vim/vim#9401) https://github.com/vim/vim/commit/8bb65f230d3025037f34021a72616038da0601ee Omit duplicate docs in fold.txt: removed in a later runtime update. Cherry-pick test_diffmode.vim changes from patch 8.2.1432. Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
* vim-patch:8.2.2973: fix for recovery and diff mode not testedzeertzjq2022-11-17
| | | | | | | | | Problem: Fix for recovery and diff mode not tested. Solution: Add a few more tests. (Yegappan Lakshmanan, closes vim/vim#8352) https://github.com/vim/vim/commit/3044324e8dccd470bd854cf7d9457232cc9c220e Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
* vim-patch:8.2.2060: check for features implemented with "if"zeertzjq2022-11-07
| | | | | | | | | Problem: Check for features implemented with "if". Solution: Use the Check commands. (Ken Takata, closes vim/vim#7383) https://github.com/vim/vim/commit/aeb313f355cd67638e3c611354ce401d86f56afe Cherry-pick test_compiler.vim changes from patch 8.1.2373.
* vim-patch:8.2.0401: not enough test coverage for evalvars.czeertzjq2022-10-26
| | | | | | | | | | | | | Problem: Not enough test coverage for evalvars.c. Solution: Add more tests. (Yegappan Lakshmanan, closes vim/vim#5804) https://github.com/vim/vim/commit/8dfcce3a78ccb520cc9d09081f998091494c50bf Assert E475 instead of E474 in :redir test because a later patch changed the error number. Comment out the test for :echo with a deeply nested container as Nvim implements :echo very differently.
* vim-patch:8.1.{1915,1921,1953} (#19900)zeertzjq2022-08-23
| | | | | | | | | | | | | | | | | | | | | | | | vim-patch:8.1.1915: more functions can be used as methods Problem: More functions can be used as methods. Solution: Make various functions usable as a method. https://github.com/vim/vim/commit/1a3a89168d61c2fed91cbca812cf1c6983901b79 Move debugbreak() to the right place. vim-patch:8.1.1921: more functions can be used as methods Problem: More functions can be used as methods. Solution: Make various functions usable as a method. https://github.com/vim/vim/commit/a4208966fb289a505ebdef62bbc37c214069bab4 vim-patch:8.1.1953: more functions can be used as a method Problem: More functions can be used as a method. Solution: Allow more functions to be used as a method. https://github.com/vim/vim/commit/f9f24ce7a0e5988fedf2e2ff751818f9b07510a6 Omit test_termcodes.vim: cannot be used and superseded by later patches. Cherry-pick test_bufline.vim change from patch 8.1.1993.
* feat: allow :wincmd to accept a count (#19815)Famiu Haque2022-08-17
| | | | | | | | | | | | | | | Let :wincmd command accept a count like what its documentation suggests. Previously it could only accept a range, which led to some ambiguity on which attribute should be used when executing :wincmd using nvim_cmd. Closes #19662. Also fix a typo in a related Vim test: vim-patch:9.0.0223: typo in diffmode test Problem: Typo in diffmode test. Solution: Fix the typo. (closes vim/vim#10932) https://github.com/vim/vim/commit/5fd6ab820b4a0aaa5c6020852f39d118375fab49
* vim-patch:9.0.0101: invalid memory access in diff mode with "dp" and undo ↵zeertzjq2022-07-29
| | | | | | | (#19568) Problem: Invalid memory access in diff mode with "dp" and undo. Solution: Make sure the line number does not go below one. https://github.com/vim/vim/commit/4e677b9c40ccbc5f090971b31dc2fe07bf05541d
* vim-patch:8.2.5166: test for DiffUpdated failszeertzjq2022-07-25
| | | | | | Problem: Test for DiffUpdated fails. Solution: Also accept a count of two. https://github.com/vim/vim/commit/f65cc665fa751bad3ffe75f58ce1251d6695949f
* vim-patch:8.2.5164: invalid memory access after diff buffer manipulationszeertzjq2022-07-25
| | | | | | Problem: Invalid memory access after diff buffer manipulations. Solution: Use zero offset when change removes all lines in a diff block. https://github.com/vim/vim/commit/c101abff4c6756db4f5e740fde289decb9452efa
* vim-patch:8.2.5163: crash when deleting buffers in diff modezeertzjq2022-07-25
| | | | | | Problem: Crash when deleting buffers in diff mode. Solution: Recompute diffs later. Skip window without a valid buffer. https://github.com/vim/vim/commit/cd38bb4d83c942c4bad596835c6766cbf32e5195
* vim-patch:8.2.5155: in diff mode windows may get out of synczeertzjq2022-07-25
| | | | | | Problem: In diff mode windows may get out of sync. (Gary Johnson) Solution: Avoid that the other window scrolls for 'cursorbind'. https://github.com/vim/vim/commit/a315ce1f326b836167ca8b1037dafd93eb8d4d4e
* vim-patch:8.2.4228: no tests for clicking in the GUI tablinezeertzjq2022-07-25
| | | | | | | Problem: No tests for clicking in the GUI tabline. Solution: Add test functions to generate the events. Add tests using the functions. (Yegappan Lakshmanan, closes vim/vim#9638) https://github.com/vim/vim/commit/b0ad2d92fd19e673ddbbc66742bae3f71778efde
* test(old): align defaults to Vim after every test (#19301)zeertzjq2022-07-10
| | | This can avoid divergences from Vim in some small places.
* vim-patch:8.2.3925: diff mode confused by NUL bytes (#18033)zeertzjq2022-04-08
| | | | | | Problem: Diff mode confused by NUL bytes. Solution: Handle NUL bytes differently. (Christian Brabandt, closes vim/vim#9421, closes vim/vim#9418) https://github.com/vim/vim/commit/06f6095623cfcc72da08748c058d13b465652fd4
* vim-patch:8.2.4520: using wrong highlight for cursor line numberzeertzjq2022-03-08
| | | | | | | Problem: Using wrong highlight for cursor line number. Solution: Take filler lines into account when using CursorLineNr. (closes vim/vim#9897) https://github.com/vim/vim/commit/127969cf98000a760826ca3a0f3781a8b79522f1
* vim-patch:8.2.4112: function not deleted at end of testSean Dewar2022-01-27
| | | | | | | | Problem: Function not deleted at end of test. Solution: Delete the function. https://github.com/vim/vim/commit/d9b74a2a41e43ca17a9885ec0a58404adff4273f oops -- my fault :P
* vim-patch:8.2.3936: no proper test for maintaining change mark in diff modeSean Dewar2022-01-27
| | | | | | | Problem: No proper test for maintaining change mark in diff mode. Solution: Run the test with internal and external diff. (Sean Dewar, closes vim/vim#9424) https://github.com/vim/vim/commit/ccc1644f95e7833c23fa0d440e42293c1622fdcb
* vim-patch:8.1.2302: :lockmarks does not work for '[ and ']Sean Dewar2022-01-27
| | | | | | | | | Problem: :lockmarks does not work for '[ and ']. Solution: save and restore '[ and '] marks. (James McCoy, closes vim/vim#5222) https://github.com/vim/vim/commit/f4a1d1c0542df151bc59ac3b798ed198b5c71ccc Test_diff_maintains_change_mark doesn't actually fail without these changes. This is fixed in v8.2.3936.
* feat(eval/method): partially port v8.1.1993Sean Dewar2021-11-26
| | | | | | | | | | | | Problem: More functions can be used as methods. Solution: Make various functions usable as a method. https://github.com/vim/vim/commit/196b4664432f932625cfb6371dc42c24efe6c203 server2client requires +clientserver, which hasn't been ported yet. The eval.txt docs and test_clientserver.vim tests for server2client already exist, so include those changes. test_bufline.vim: Test for setbufline requires v8.1.1189 (which was reverted in #10848).
* vim-patch:8.2.3556: filler lines are incorrect for other window in diff mode ↵Jaehwang Jerry Jung2021-10-28
| | | | | | | | (#16164) Problem: Filler lines are incorrect for other window in diff mode after making a change. Solution: Copy filler lines from the current window. (closes vim/vim#8809) https://github.com/vim/vim/commit/841c225b9ef8c5bdf5e02968a0bd62521fff6ca8
* vim-patch:8.2.3394: filler lines are wrong when changing text in diff mode ↵Jaehwang Jerry Jung2021-09-18
| | | | | | | | (#15547) Problem: Filler lines are wrong when changing text in diff mode. Solution: Don't change the filler lines on every change. Check scrollbinding when updating the filler lines. (closes vim/vim#8809) https://github.com/vim/vim/commit/04626c243c47af91c2580eaf23e12286180e0e81
* Merge #15293 Vimscript "method" syntaxJustin M. Keyes2021-08-26
|\ | | | | Port VimL's method call syntax - vim-patch:8.1.{1638,1800,1803,1807,1809,1816,1820,1821,1828,1834,1835,1861,1863,1878,1879,1888,1909,1911,1912}
| * feat(eval): partially port v8.1.1915Sean Dewar2021-08-12
| | | | | | | | Cannot be fully ported as chdir() hasn't been ported yet.
| * vim-patch:8.1.1809: more functions can be used as a methodSean Dewar2021-08-12
| | | | | | | | | | | | Problem: More functions can be used as a method. Solution: Add has_key(), split(), str2list(), etc. https://github.com/vim/vim/commit/a74e4946de074d2916e3d6004f7fa1810d12dda9
* | test: update tests to work with 'hidden'Gregory Anders2021-08-18
| |
* | vim-patch:8.2.3295: 'cursorline' should not apply to 'breakindent' #15281zeertzjq2021-08-16
|/ | | | | | Problem: 'cursorline' should not apply to 'breakindent'. Solution: Make 'cursorline' apply to 'breakindent' and 'showbreak' consistently. (closes vim/vim#8684) https://github.com/vim/vim/commit/4f33bc20d7d5444e44d13f954e8219ad1abd26ef
* vim-patch:8.2.1957: diff and cursorcolumn highlighting don't mixJan Edmund Lazo2021-05-24
| | | | | | | Problem: Diff and cursorcolumn highlighting don't mix. Solution: Fix condition for what attribute to use. (Christian Brabandt, closes vim/vim#7258, closes vim/vim#7260) https://github.com/vim/vim/commit/fabc3ca896751277f18a3a68e5661179728db3ad
* vim-patch:8.2.2880: unified diff fails if actually usedJan Edmund Lazo2021-05-24
| | | | | | | Problem: Unified diff fails if actually used. Solution: Invoke :diffupdate in the test. Fix the check for working external diff. (Ghjuvan Lacambre, Christian Brabandt, closes vim/vim#8197) https://github.com/vim/vim/commit/ad5c178a191cf2cf37a27c2a789d7afda3879831
* vim-patch:8.2.2869: using unified diff is not testedJan Edmund Lazo2021-05-19
| | | | | | Problem: Using unified diff is not tested. Solution: Test all cases also with unified diff. (issue vim/vim#8197) https://github.com/vim/vim/commit/485b62710004431a16feb4eb861365d082304a08
* vim-patch:8.2.0064: diffmode completion doesn't use per-window settingJan Edmund Lazo2021-02-13
| | | | | | Problem: Diffmode completion doesn't use per-window setting. Solution: Check if a window is in diff mode. (Dominique Pell, closes vim/vim#5419) https://github.com/vim/vim/commit/efcc329020ef089267f5f3994b8544eb58806311
* vim-patch:8.2.0054: :diffget and :diffput don't have good completionJan Edmund Lazo2021-02-13
| | | | | | Problem: :diffget and :diffput don't have good completion. Solution: Add proper completion. (Dominique Pelle, closes vim/vim#5409) https://github.com/vim/vim/commit/ae7dba896975051a3f0b7123faa08dac5635972d
* vim-patch:8.2.1058: multiline conceal causes display errorsJan Edmund Lazo2021-02-13
| | | | | | | | | Problem: Multiline conceal causes display errors. Solution: Do not allow conceal cross over EOL. (closes vim/vim#6326, closes vim/vim#4854, closes vim/vim#6302) https://github.com/vim/vim/commit/fc838d6cb0f22c77a6ee2befd034b593e1c5ea06 Port test_conceal.vim but skip tests that require screendumps.
* vim-patch:8.2.2490: 'wrap' option is always reset when starting diff modeJan Edmund Lazo2021-02-10
| | | | | | Problem: 'wrap' option is always reset when starting diff mode. Solution: Add the "followwrap" item in 'diffopt'. (Rick Howe, closes vim/vim#7797) https://github.com/vim/vim/commit/4223d43c0fb6ead1e611e4469a1680a9228b6015
* vim-patch:8.1.2041: no test for diff mode with syntax highlightingJan Edmund Lazo2020-08-30
| | | | | | Problem: No test for diff mode with syntax highlighting. Solution: Add a test case. https://github.com/vim/vim/commit/248fdb33320641804afed4bdf5dc5cddb1cf64f5
* vim-patch:8.1.1804: no test for display updating without a scroll regionJan Edmund Lazo2020-08-30
| | | | | | Problem: No test for display updating without a scroll region. Solution: Add a test. https://github.com/vim/vim/commit/3c8ee629745737aa231fdd123826ae021e398e49
* vim-patch:8.2.1004: line numbers below filler lines not always updatedJan Edmund Lazo2020-08-02
| | | | | | | Problem: Line numbers below filler lines not always updated. Solution: Don't break out of the win_line() loop too early. (Christian Brabandt, closes vim/vim#6294, closes vim/vim#6138) https://github.com/vim/vim/commit/511feec6f0a9e954f1d7353425fa51232b1a8e88
* vim-patch:8.2.1211: removed more than dead codeJan Edmund Lazo2020-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | Problem: Removed more than dead code. Solution: Put back the decrement. https://github.com/vim/vim/commit/8455c5ed31c9cb2919f5e62693bab6b09bf60df2 N/A patch for version.c: vim-patch:8.2.1118: condition can never be true, dead code Problem: Condition can never be true, dead code. Solution: Remove the dead code. https://github.com/vim/vim/commit/810af5ea460eab820cc5899892067d8c242be688 vim-patch:8.2.1214: MS-Windows: default _vimrc not correct in silent install mode Problem: MS-Windows: default _vimrc not correct in silent install mode. Solution: Add the LoadDefaultVimrc macro. (Ken Takata, closes vim/vim#6451) https://github.com/vim/vim/commit/ceb56ddbafbca01e52ff4291d9480bf83d739793 vim-patch:8.2.1215: Atari MiNT support is outdated Problem: Atari MiNT support is outdated. Solution: Nobody responded this code is still useful, so let's delete it. https://github.com/vim/vim/commit/e3f915d12c8fe0466918a29ab4eaef153f71a2cd
* vim-patch:8.1.1581: shared functions for testing are disorganisedJan Edmund Lazo2020-05-03
| | | | | | Problem: Shared functions for testing are disorganised. Solution: Group finctions in script files. (Ozaki Kiichi, closes vim/vim#4573) https://github.com/vim/vim/commit/7a39dd7f00239059ce34660611589b26126a550c
* foldcolumn: allow auto:XMatthieu Coudron2020-02-29
| | | | | | | | Similar to signcolumn, allow foldcolumn to adapt itself to the number of folds. Regression: vim supports a maximum fdc of 12, this limits it to 9.
* vim-patch:8.1.2289: after :diffsplit closing the window does not disable diffJan Edmund Lazo2019-11-16
| | | | | | Problem: After :diffsplit closing the window does not disable diff. Solution: Add "closeoff" to 'diffopt' and add it to the default. https://github.com/vim/vim/commit/c8234779790dd873acb88331c50988adf94cc383
* vim-patch:8.1.1483: skipped tests are not properly listedDaniel Hahler2019-08-22
| | | | | | | | | | Problem: Skipped tests are not properly listed. Solution: Throw a "Skipped" exception instead of using ":finish" or ":return". https://github.com/vim/vim/commit/5d30ff19648d2ff0696cea97582b902f6a4ec0ba Skips quite some (N/A) tests. vim-patch:8.1.0503: missing change to diff test (included in cf1ffa916)
* vim-patch:8.1.1634: terminal test fails when term_getansicolors() is missingJan Edmund Lazo2019-07-05
| | | | | | | Problem: Terminal test fails when term_getansicolors() is missing. Diff test fails without +rightleft. (Dominique Pelle) Solution: Check if term_getansicolors() is supported. (closes vim/vim#4597) https://github.com/vim/vim/commit/981d9dc8f3d7a470eb3be7ba60fe1c1f31e7f470
* vim-patch:8.1.1073: space in number column is on wrong side with 'rightleft' setJan Edmund Lazo2019-03-31
| | | | | | Problem: Space in number column is on wrong side with 'rightleft' set. Solution: Move the space to the text side. Add a test. https://github.com/vim/vim/commit/e73f911c53de1c87e39456ba20782f72a0ca8f4f
* eval: diff_hlID() and hlID() return same idJan Edmund Lazo2019-03-31
|
* vim-patch:8.0.1153: no tests for diff_hlID() and diff_filler()Jan Edmund Lazo2019-03-31
| | | | | | Problem: No tests for diff_hlID() and diff_filler(). Solution: Add tests. (Dominique Pelle, closes vim/vim#2156) https://github.com/vim/vim/commit/97fbc404fc56f76df12b2d2658b1d6efda28d5dd
* vim-patch:8.1.0497: :%diffput changes order of linesAnatolii Sakhnik2018-12-09
| | | | | | | Problem: :%diffput changes order of lines. (Markus Braun) Solution: Do adjust marks when using internal diff. https://github.com/vim/vim/commit/5f57bdcab77bc417ae0357fe8ad6c7259b6d25df
* vim-patch:8.1.0458: ml_get error and crash when using "do"Anatolii Sakhnik2018-12-09
| | | | | | | | Problem: Ml_get error and crash when using "do". Solution: Adjust cursor position also when diffupdate is not needed. (Hirohito Higashi) https://github.com/vim/vim/commit/df77cef92ec034796723ffa3adb12e8b46daa98e
* vim-patch:8.1.0397: no event triggered after updating diffsAnatolii Sakhnik2018-12-09
| | | | | | | Problem: No event triggered after updating diffs. Solution: Add the DiffUpdated event. https://github.com/vim/vim/commit/e8fa05b5bc2d6d76bf5af50176a63655d00d1110
* vim-patch:8.1.0375: cannot use diff mode with Cygwin diff.exeAnatolii Sakhnik2018-12-09
| | | | | | | Problem: Cannot use diff mode with Cygwin diff.exe. (Igor Forca) Solution: Skip over unrecognized lines in the diff output. https://github.com/vim/vim/commit/3b8defd0a52fc1276816608e7bb24b628ab14c2e
generated by cgit (git 2.34.1) at 2025-08-11 16:58:53 +0000