aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/diff.c
Commit message (Collapse)AuthorAge
...
* vim-patch:8.1.0562: parsing of 'diffopt' is slightly wrongAnatolii Sakhnik2018-12-09
| | | | | | | | Problem: Parsing of 'diffopt' is slightly wrong. Solution: Fix the parsing and add a test. (Jason Franklin, Christian Brabandt) https://github.com/vim/vim/commit/b6fc72851c45a36a370f9516c68508e47b41c4c1
* vim-patch:8.1.0513: no error for set diffopt+=algorithm:Anatolii Sakhnik2018-12-09
| | | | | | | Problem: No error for set diffopt+=algorithm:. Solution: Check for missing argument. (Hirohito Higashi, closes #3598) https://github.com/vim/vim/commit/d0721058f494143186f66a60151c9634031a8c96
* vim-patch:8.1.0502: internal diff fails when diffing a context diffAnatolii Sakhnik2018-12-09
| | | | | | | Problem: Internal diff fails when diffing a context diff. (Hirohito Higashi) Solution: Only use callback calls with one line. (closes #3581) https://github.com/vim/vim/commit/f080d70a82f3a4477f346d9efcdfaec1bc1e1d58
* 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.0402: the DiffUpdate event isn't triggered for :diffputAnatolii Sakhnik2018-12-09
| | | | | | | Problem: The DiffUpdate event isn't triggered for :diffput. Solution: Also trigger DiffUpdate for :diffget and :diffput. https://github.com/vim/vim/commit/198fa066b2ec011e91012c1a3d85a73df7b93f31
* vim-patch:8.1.0400: using freed memory with :diffgetAnatolii Sakhnik2018-12-09
| | | | | | | Problem: Using freed memory with :diffget. Solution: Skip ex_diffupdate() while updating diffs. (closes #3442) https://github.com/vim/vim/commit/d2b58c0a2c665075a8cfef57db6e1b37d4523e02
* 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.0395: compiler warning on 64-bit MS-WindowsAnatolii Sakhnik2018-12-09
| | | | | | | Problem: Compiler warning on 64-bit MS-Windows. Solution: Add type cast. (Mike Williams) https://github.com/vim/vim/commit/6e272acc82af900318017061f923e7f66dc7ee7a
* vim-patch:8.1.0394: diffs are not always updated correctlyAnatolii Sakhnik2018-12-09
| | | | | | | Problem: Diffs are not always updated correctly. Solution: When using internal diff update for any changes properly. https://github.com/vim/vim/commit/e3521d9cbb786806eaff106707851d37d2c0ecef
* vim-patch:8.1.0393: not all white space difference options availableAnatolii Sakhnik2018-12-09
| | | | | | | Problem: Not all white space difference options available. Solution: Add "iblank", "iwhiteall" and "iwhiteeol" to 'diffopt'. https://github.com/vim/vim/commit/785fc6567f572b8caefbc89ec29bbd8b801464ae
* 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
* Remove has_mbyte from lines near changes in parent commitZviRackover2018-08-16
|
* Remove occurences of mb_head_offZviRackover2018-08-15
|
* 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
* diff: drop enc_utf8 check in diff_equal_char()Jan Edmund Lazo2018-08-11
| | | | enc_utf8 is always true for nvim.
* vim-patch:8.0.1046: code duplication in diff modeJan Edmund Lazo2018-08-11
| | | | | | Problem: Code duplication in diff mode. Solution: Use diff_equal_char() also in diff_cmp(). (Rick Howe) https://github.com/vim/vim/commit/ae96b8d058cffd9d07b78cb7a9ccd382185b9dd6
* 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
* fold: add const to hasFoldingWin() variablesJan Edmund Lazo2018-08-02
| | | | cache is bool so update callers to pass true/false, not TRUE/FALSE.
* diff: refactor diff_a_works to use TriStateJan Edmund Lazo2018-08-01
|
* API: Implement buffer updatesPeter Hodge2018-05-23
| | | | | Originally written by @phodge in https://github.com/neovim/neovim/pull/5269.
* diff: Fix PVS/V547: remove no longer needed OOM handlerZyX2018-04-10
|
* vim-patch:8.0.0736: OptionSet not triggered when entering diff modeJustin M. Keyes2018-02-11
| | | | | | | | | Problem: The OptionSet autocommand event is not triggered when entering diff mode. Solution: use set_option_value() instead of setting the option directly. Change the tests from old to new style. (Christian Brabandt) https://github.com/vim/vim/commit/04f62f881c5743d2fdaf7324f6a715381f0d5fcf
* exit: annotate FUNC_ATTR_NORETURN functions #7954 (#7954)Justin M. Keyes2018-02-07
| | | | This should fix a particular false positive from clang 5.0.0 scan-build, which thinks that nlua_init() can continue after preserve_exit().
* vim-patch:8.0.0448: some macros are lower case (#7936)KunMing Xie2018-01-30
| | | | | | | Problem: Some macros are in lower case, which can be confusing. Solution: Make a few lower case macros upper case. https://github.com/vim/vim/commit/b5aedf3e228d35821591da9ae8501b61cf2e264c ref #6297
* ex_diffpatch: don't need redraw_later(CLEAR), Nvim uses pipesJustin M. Keyes2018-01-28
|
* 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.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
* 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
* bufhl: fix moveBjörn Linse2017-06-24
|
* *: Add comment to all C filesZyX2017-04-19
|
* diff: Silence -V519ZyX2017-04-16
| | | | Not exactly a false positive, but previous assignment is a part of the pattern “change global, run code which uses it, change global back”.
* *: Move some dictionary functions to typval.h and use char*ZyX2017-03-29
| | | | Also fixes buffer reusage in setmatches() and complete().
* vim-patch:7.4.2135lonerover2017-03-11
| | | | | | | Problem: Various tiny issues. Solution: Update comments, white space, etc. https://github.com/vim/vim/commit/89eaa4185efacab253b23a182c1c8a7bbf1096c9
* vim-patch:7.4.2279lonerover2017-02-09
| | | | | | | | Problem: Starting diff mode with the cursor in the last line might end up only showing one closed fold. (John Beckett) Solution: Scroll the window to show the same relative cursor position. https://github.com/vim/vim/commit/46328f9a1cc8047d1e05095bc9f531038c5a4028
* 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.2024Marco Hinz2017-02-04
| | | | | | | | | | Problem: More buf_valid() calls can be optimized. Solution: Use bufref_valid() instead. NOTE: Some changes related to channels and the Python and Netbeans interfaces were obviously left out. https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
* doc: minor comment tweaksJustin M. Keyes2016-09-28
|
* refactor: eliminate misc2.cJustin M. Keyes2016-09-13
| | | | | | | | | | move `call_shell` to misc1.c Move some fns to state.c Move some fns to option.c Move some fns to memline.c Move `vim_chdir*` fns to file_search.c Move some fns to new module, bytes.c Move some fns to fileio.c
* Merge tempfile.c back into fileio.cJurica Bradaric2016-04-20
|
* *: Make set_vim_var_\* functions have proper argument typesZyX2016-04-18
|
* quickfix.c: enable -WconversionCharles Joachim2016-03-10
|
* diff.c: change return type to boolCharles Joachim2016-02-15
| | | | Co-authored-by: Wayne Rowcliffe (@war1025)
* Merge #4152 'vim-patch:7.4.{798,800,805,810,811,814,815,816,817,820,825}'.Justin M. Keyes2016-02-09
|\
| * vim-patch:7.4.810Jurica Bradaric2016-02-02
| | | | | | | | | | | | | | | | Problem: With a sequence of commands using buffers in diff mode E749 is given. (itchyny) Solution: Skip unloaded buffer. (Hirohito Higashi) https://github.com/vim/vim/commit/9dd33af4baf5fd7d3a7a779d8363834b38804946
* | vim-patch:7.4.768Jurica Bradaric2016-02-09
|/ | | | | | | Problem: :diffoff only works properly once. Solution: Also make :diffoff work when used a second time. (Olaf Dabrunz) https://github.com/vim/vim/commit/4392996461f56803d5c4a4919ba6dc509434bef5
* vim patches 7.4.955/974/975/989. #3919Michael Ennen2016-01-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Helped by @Shougo. vim-patch:7.4.955 vim-patch:7.4.974 vim-patch:7.4.975 vim-patch:7.4.989 Port upstream vim patches 955, 974, 975 and 989. Mark patches 964, 968, 970, and 971, and 982 as NA. Update patch list to 1022. patch 7.4.955 Problem: Vim doesn't recognize .pl6 and .pod6 files. Solution: Recognize them as perl6 and pod6. (Mike Eve) patch 7.4.974 Problem: When using :diffsplit the cursor jumps to the first line. Solution: Put the cursor on the line related to where the cursor was before the split. patch 7.4.975 Problem: Using ":sort" on a very big file sometimes causes text to be corrupted. (John Beckett) Solution: Copy the line into a buffer before calling ml_append(). patch 7.4.989 Problem: Leaking memory when hash_add() fails. Coverity error 99126. Solution: When hash_add() fails free the memory. 778 marked as not NA as it will be needed once vim patch 754 is merged Marked as NA: 964 test 87 was deleted 968 tests 86/87 were deleted 970 guarded by: `# if defined(FEAT_GUI_GTK) || defined(PROTO` and is inside a function that no longer exists 971 function table already sorted correctly 982 marked as NA because Neovim tests are only specified in exactly one location
generated by cgit (git 2.34.1) at 2025-04-29 09:41:14 +0000