summaryrefslogtreecommitdiffstats
path: root/src/diff.c
AgeCommit message (Collapse)Author
2018-03-04patch 8.0.1566: too many #ifdefsv8.0.1566Bram Moolenaar
Problem: Too many #ifdefs. Solution: Graduate FEAT_SCROLLBIND and FEAT_CURSORBIND.
2018-03-04patch 8.0.1564: too many #ifdefsv8.0.1564Bram Moolenaar
Problem: Too many #ifdefs. Solution: Graduate the +autocmd feature. Takes away 450 #ifdefs and increases code size of tiny Vim by only 40 Kbyte.
2017-12-01patch 8.0.1361: some users don't want to diff with hidden buffersv8.0.1361Bram Moolenaar
Problem: Some users don't want to diff with hidden buffers. Solution: Add the "hiddenoff" item to 'diffopt'. (Alisue, closes #2394)
2017-09-04patch 8.0.1056: cannot build with +diff but without +multi_bytev8.0.1056Bram Moolenaar
Problem: Cannot build with the diff feature but without the mutli-byte feature. Solution: Remove #ifdefs. (John Marriott)
2017-09-03patch 8.0.1046: code duplication in diff modev8.0.1046Bram Moolenaar
Problem: Code duplication in diff mode. Solution: Use diff_equal_char() also in diff_cmp(). (Rick Howe)
2017-09-02patch 8.0.1037: "icase" of 'diffopt' is not used for highlightingv8.0.1037Bram Moolenaar
Problem: "icase" of 'diffopt' is not used for highlighting differences. Solution: Also use "icase". (Rick Howe)
2017-07-19patch 8.0.0736: OptionSet not triggered when entering diff modev8.0.0736Bram Moolenaar
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)
2017-05-16patch 8.0.0599: diff mode is insufficiently testedv8.0.0599Bram Moolenaar
Problem: diff mode is insufficiently tested Solution: Add more test cases. (Dominique Pelle, closes #1685)
2017-03-12patch 8.0.0452: some macros are in lower casev8.0.0452Bram Moolenaar
Problem: Some macros are in lower case. Solution: Make a few more macros upper case.
2017-03-12patch 8.0.0448: some macros are in lower casev8.0.0448Bram Moolenaar
Problem: Some macros are in lower case, which can be confusing. Solution: Make a few lower case macros upper case.
2017-03-11patch 8.0.0444: diffpatch fails when the file name has a quotev8.0.0444Bram Moolenaar
Problem: Diffpatch fails when the file name has a quote. Solution: Escape the name properly. (zetzei)
2017-03-09patch 8.0.0442: patch shell command not well escapedv8.0.0442Bram Moolenaar
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 #1543)
2017-03-05patch 8.0.0425: build errors when building without foldingv8.0.0425Bram Moolenaar
Problem: Build errors when building without folding. Solution: Add #ifdefs. (John Marriott)
2017-02-03patch 8.0.0300: cannot stop diffing hidden buffersv8.0.0300Bram Moolenaar
Problem: Cannot stop diffing hidden buffers. (Daniel Hahler) Solution: When using :diffoff! make the whole list if diffed buffers empty. (closes #736)
2016-10-18patch 8.0.0044v8.0.0044Bram Moolenaar
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.
2016-08-29patch 7.4.2293v7.4.2293Bram Moolenaar
Problem: Modelines in source code are inconsistant. Solution: Use the same line in most files. Add 'noet'. (Naruhiko Nishino)
2016-08-28patch 7.4.2279v7.4.2279Bram Moolenaar
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.
2016-08-27patch 7.4.2275v7.4.2275Bram Moolenaar
Problem: ":diffoff!" does not remove filler lines. Solution: Force a redraw and invalidate the cursor. (closes #1014)
2016-07-31patch 7.4.2135v7.4.2135Bram Moolenaar
Problem: Various tiny issues. Solution: Update comments, white space, etc.
2016-07-24patch 7.4.2101v7.4.2101Bram Moolenaar
Problem: Looping over windows, buffers and tab pages is inconsistant. Solution: Use FOR_ALL_ macros everywhere. (Yegappan Lakshmanan)
2016-07-10patch 7.4.2024v7.4.2024Bram Moolenaar
Problem: More buf_valid() calls can be optimized. Solution: Use bufref_valid() instead.
2016-07-01patch 7.4.1975v7.4.1975Bram Moolenaar
Problem: On MS-Windows large files (> 2Gbyte) cause problems. Solution: Use "off_T" instead of "off_t". Use "stat_T" instead of "struct stat". Use 64 bit system functions if available. (Ken Takata)
2016-03-03patch 7.4.1476v7.4.1476Bram Moolenaar
Problem: Function arguments marked as unused while they are not. Solution: Remove UNUSED. (Yegappan Lakshmanan)
2016-02-23patch 7.4.1399v7.4.1399Bram Moolenaar
Problem: The MS-DOS code does not build. Solution: Remove the old MS-DOS code.
2016-01-30patch 7.4.1205v7.4.1205Bram Moolenaar
Problem: Using old style function declarations. Solution: Change to new style function declarations. (script by Hirohito Higashi)
2016-01-29patch 7.4.1196v7.4.1196Bram Moolenaar
Problem: Still using __ARGS. Solution: Remove __ARGS in several files. (script by Hirohito Higashi)
2015-12-17patch 7.4.974v7.4.974Bram Moolenaar
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.
2015-08-04patch 7.4.810v7.4.810Bram Moolenaar
Problem: With a sequence of commands using buffers in diff mode E749 is given. (itchyny) Solution: Skip unloaded buffer. (Hirohito Higashi)
2015-07-03patch 7.4.768v7.4.768Bram Moolenaar
Problem: :diffoff only works properly once. Solution: Also make :diffoff work when used a second time. (Olaf Dabrunz)
2015-03-31updated for version 7.4.684v7.4.684Bram Moolenaar
Problem: When starting several Vim instances in diff mode, the temp files used may not be unique. (Issue 353) Solution: Add an argument to vim_tempname() to keep the file.
2014-10-31updated for version 7.4.490v7.4.490Bram Moolenaar
Problem: Cannot specify the buffer to use for "do" and "dp", making them useless for three-way diff. Solution: Use the count as the buffer number. (James McCoy)
2014-10-15updated for version 7.4.477v7.4.477Bram Moolenaar
Problem: When using ":%diffput" and the other file is empty an extra empty line remains. Solution: Set the buf_empty flag.
2014-05-28updated for version 7.4.308v7.4.308Bram Moolenaar
Problem: When using ":diffsplit" on an empty file the cursor is displayed on the command line. Solution: Limit the value of w_topfill.
2013-09-20updated for version 7.4.031v7.4.031Bram Moolenaar
Problem: ":diffoff!" resets options even when 'diff' is not set. (Charles Cooper) Solution: Only resets related options in a window where 'diff' is set.
2013-07-17updated for version 7.4a.026v7.4a.026Bram Moolenaar
Problem: ":diffoff" does not remove folds. (Ramel) Solution: Do not restore 'foldenable' when 'foldmethod' is "manual".
2013-07-03updated for version 7.3.1294v7.3.1294Bram Moolenaar
Problem: ":diffoff" resets options. Solution: Save and restore option values. (Christian Brabandt)
2013-05-06updated for version 7.3.925v7.3.925Bram Moolenaar
Problem: Typos in source files. Solution: Fix the typos. (Ken Takata)
2013-03-19updated for version 7.3.869v7.3.869Bram Moolenaar
Problem: bufwinnr() matches buffers in other tabs. Solution: For bufwinnr() and ? only match buffers in the current tab. (Alexey Radkov)
2012-10-21updated for version 7.3.708v7.3.708Bram Moolenaar
Problem: Filler lines above the first line may be hidden when opening Vim. Solution: Change how topfill is computed. (Christian Brabandt)
2012-05-18updated for version 7.3.523v7.3.523Bram Moolenaar
Problem: ":diffupdate" doesn't check for files changed elsewhere. Solution: Add the ! flag. (Christian Brabandt)
2010-09-21updated for version 7.3.008v7.3.008Bram Moolenaar
Problem: 'cursorbind' is kept in places where 'scrollbind' is reset. Solution: Reset 'cursorbind'.
2010-07-31Fixes for coverity warnings.Bram Moolenaar
2010-06-05Add the conceal patch from Vince Negri.Bram Moolenaar
2010-02-24updated for version 7.2.370v7.2.370Bram Moolenaar
Problem: A redraw may cause folds to be closed. Solution: Revert part of the previous patch. Add a test. (Lech Lorens)
2009-07-22updated for version 7.2-239v7.2.239Bram Moolenaar
2009-05-14updated for version 7.2-173v7.2.173Bram Moolenaar
2009-05-13updated for version 7.2-169v7.2.169Bram Moolenaar
2009-03-11updated for version 7.2-133v7.2.133Bram Moolenaar
2009-01-22updated for version 7.2-086v7.2.086Bram Moolenaar
2008-11-30updated for version 7.2-059v7.2.059Bram Moolenaar