aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/testdir/test_diffmode.vim
Commit message (Collapse)AuthorAge
* 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
* vim-patch:8.1.0360: using an external diff program is slow and inflexibleAnatolii Sakhnik2018-12-09
| | | | | | | | | | | | | | | | | | Problem: Using an external diff program is slow and inflexible. Solution: Include the xdiff library. (Christian Brabandt) Use it by default. https://github.com/vim/vim/commit/e828b7621cf9065a3582be0c4dd1e0e846e335bf vim-patch:8.1.0360 vim-patch:8.1.0364 vim-patch:8.1.0366 vim-patch:8.1.0370 vim-patch:8.1.0377 vim-patch:8.1.0378 vim-patch:8.1.0381 vim-patch:8.1.0396 vim-patch:8.1.0432
* vim-patch:8.1.0448: cursorline not removed when using 'cursorbind'Justin M. Keyes2018-10-16
| | | | | | Problem: Cursorline not removed when using 'cursorbind'. (Justin Keyes) Solution: Store the last cursor line per window. (closes vim/vim#3488) https://github.com/vim/vim/commit/4a5abbd6138240d109278fe1f0b45489d22f712d
* vim-patch:8.0.1361: some users don't want to diff with hidden buffersJan Edmund Lazo2018-08-11
| | | | | | Problem: Some users don't want to diff with hidden buffers. Solution: Add the "hiddenoff" item to 'diffopt'. (Alisue, closes vim/vim#2394) https://github.com/vim/vim/commit/97ce419201421f65f4764549ed80307a7ef9c7a6
* vim-patch:8.0.1037: "icase" of 'diffopt' is not used for highlightingJan Edmund Lazo2018-08-11
| | | | | | Problem: "icase" of 'diffopt' is not used for highlighting differences. Solution: Also use "icase". (Rick Howe) https://github.com/vim/vim/commit/da22b8cc8b1b96fabd5a4c35c57b04a351340fb1
* vim-patch:8.0.1200: tests switch the bell off twiceJustin M. Keyes2018-02-11
| | | | | | | Problem: Tests switch the bell off twice. Solution: Don't set 'belloff' in individual tests. (Christian Brabandt) https://github.com/vim/vim/commit/67418d97b457d2e27fe342472d3c9fd342ffc47f
* vim-patch:8.0.0444: diffpatch fails when the file name has a quoteJustin M. Keyes2018-01-21
| | | | | | | Problem: Diffpatch fails when the file name has a quote. Solution: Escape the name properly. (zetzei) https://github.com/vim/vim/commit/a95ab321200f0239991bf53756b17cd7b90745f9
* vim-patch:8.0.0442: patch shell command not well escapedJustin M. Keyes2018-01-21
| | | | | | | | Problem: Patch shell command uses double quotes around the argument, which allows for $HOME to be expanded. (Etienne) Solution: Use single quotes on Unix. (closes vim/vim#1543) https://github.com/vim/vim/commit/1ef73e33c9414eb02c229d8234aafd9d481a8856
* vim-patch:8.0.0433: beeps when running testsJustin M. Keyes2018-01-21
| | | | | | | Problem: Quite a few beeps when running tests. Solution: Set 'belloff' for these tests. (Christian Brabandt) https://github.com/vim/vim/commit/c3c766ea8c35f5b2bd45fb3d74d0ae46b2d8c24f
* vim-patch:8.0.0599: diff mode is insufficiently testedJustin M. Keyes2018-01-21
| | | | | | | | | | | | | | | Problem: diff mode is insufficiently tested Solution: Add more test cases. (Dominique Pelle, closes vim/vim#1685) https://github.com/vim/vim/commit/79a213d6a4e909703524a7f1ad985c7bd40650a6 NA / already applied: --------------------- vim-patch:8.0.0421: diff mode wrong when adding line at end of buffer Problem: Diff mode is displayed wrong when adding a line at the end of a buffer. Solution: Adjust marks in diff mode. (James McCoy, closes vim/vim#1329) https://github.com/vim/vim/commit/f58a8475e17bd566760fc7e2a17d35ddf4edacf2
* Merge #7850 'vim patches'Justin M. Keyes2018-01-15
|\
| * vim-patch:8.0.0381: diff mode is not sufficiently testedckelsel2018-01-14
| | | | | | | | | | | | | | Problem: Diff mode is not sufficiently tested. Solution: Add more diff mode tests. (Dominique Pelle, closes vim/vim#1515) https://github.com/vim/vim/commit/aeb661e1f4a491286ef7af8c3105aff1f3b16f1c
* | vim-patch:8.0.0421: diff mode wrong when adding line at end of bufferckelsel2018-01-15
|/ | | | | | | | Problem: Diff mode is displayed wrong when adding a line at the end of a buffer. Solution: Adjust marks in diff mode. (James McCoy, closes vim/vim#1329) https://github.com/vim/vim/commit/f58a8475e17bd566760fc7e2a17d35ddf4edacf2
* Vim-patch 8.0.0300 (#7258)KunMing Xie2017-09-11
| | | | | | | | | vim-patch:8.0.0300 Problem: Cannot stop diffing hidden buffers. (Daniel Hahler) Solution: When using :diffoff! make the whole list if diffed buffers empty. (closes vim/vim#736) https://github.com/vim/vim/commit/25ea0544587dd45088512fec9d7a685e35fea679
* vim-patch:8.0.0044ckelsel2017-08-16
| | | | | | | | Problem: In diff mode the cursor may end up below the last line, resulting in an ml_get error. Solution: Check the line to be valid. https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
* vim-patch:7.4.2275lonerover2017-02-07
| | | | | | | Problem: ":diffoff!" does not remove filler lines. Solution: Force a redraw and invalidate the cursor. (closes vim/vim#1014) https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
* vim-patch:7.4.2126lonerover2016-12-23
| | | | | | | Problem: No tests for :diffget and :diffput Solution: Add tests. https://github.com/vim/vim/commit/90d121fa3637b423169c64528efe84a1e67060c9
* vim-patch:7.4.2124lonerover2016-12-23
| | | | | | | Problem: diffmode test leaves files behind, breaking another test. Solution: Delete the files. https://github.com/vim/vim/commit/623cf88f9c5ad49cce8e846af29a1bb9346c7481
* vim-patch:7.4.2123lonerover2016-12-22
Problem: No new style test for diff mode. Solution: Add a test. Check that folds are in sync. https://github.com/vim/vim/commit/42093c0ec52e6ff29e80aae65ac6a744c7de79bb
generated by cgit (git 2.34.1) at 2025-08-10 04:55:18 +0000