summaryrefslogtreecommitdiff
path: root/src/diff.c
Commit message (Collapse)AuthorAgeFilesLines
* patch 8.1.0927: USE_CR is never definedv8.1.0927Bram Moolenaar2019-02-151-8/+4
| | | | | Problem: USE_CR is never defined. Solution: Remove usage of USE_CR. (Ken Takata, closes #3958)
* patch 8.1.0805: too many #ifdefsv8.1.0805Bram Moolenaar2019-01-241-13/+1
| | | | | Problem: Too many #ifdefs. Solution: Graduate FEAT_MBYTE, part 1.
* patch 8.1.0753: printf format not checked for semsg()v8.1.0753Bram Moolenaar2019-01-151-1/+1
| | | | | | Problem: printf format not checked for semsg(). Solution: Add GNUC attribute and fix reported problems. (Dominique Pelle, closes #3805)
* patch 8.1.0743: giving error messages is not flexiblev8.1.0743Bram Moolenaar2019-01-131-17/+16
| | | | | | | | Problem: Giving error messages is not flexible. Solution: Add semsg(). Change argument from "char_u *" to "char *", also for msg() and get rid of most MSG macros. (Ozaki Kiichi, closes #3302) Also make emsg() accept a "char *" argument. Get rid of an enormous number of type casts.
* patch 8.1.0562: parsing of 'diffopt' is slightly wrongv8.1.0562Bram Moolenaar2018-12-041-1/+4
| | | | | | Problem: Parsing of 'diffopt' is slightly wrong. Solution: Fix the parsing and add a test. (Jason Franklin, Christian Brabandt)
* patch 8.1.0513: no error for set diffopt+=algorithm:v8.1.0513Bram Moolenaar2018-11-051-0/+2
| | | | | Problem: No error for set diffopt+=algorithm:. Solution: Check for missing argument. (Hirohito Higashi, closes #3598)
* patch 8.1.0502: internal diff fails when diffing a context diffv8.1.0502Bram Moolenaar2018-10-311-13/+15
| | | | | Problem: Internal diff fails when diffing a context diff. (Hirohito Higashi) Solution: Only use callback calls with one line. (closes #3581)
* patch 8.1.0497: :%diffput changes order of linesv8.1.0497Bram Moolenaar2018-10-251-2/+2
| | | | | Problem: :%diffput changes order of lines. (Markus Braun) Solution: Do adjust marks when using internal diff.
* patch 8.1.0458: ml_get error and crash when using "do"v8.1.0458Bram Moolenaar2018-10-071-9/+10
| | | | | | Problem: Ml_get error and crash when using "do". Solution: Adjust cursor position also when diffupdate is not needed. (Hirohito Higashi)
* patch 8.1.0402: the DiffUpdate event isn't triggered for :diffputv8.1.0402Bram Moolenaar2018-09-181-14/+25
| | | | | Problem: The DiffUpdate event isn't triggered for :diffput. Solution: Also trigger DiffUpdate for :diffget and :diffput.
* patch 8.1.0400: using freed memory with :diffgetv8.1.0400Bram Moolenaar2018-09-161-2/+15
| | | | | Problem: Using freed memory with :diffget. Solution: Skip ex_diffupdate() while updating diffs. (closes #3442)
* patch 8.1.0397: no event triggered after updating diffsv8.1.0397Bram Moolenaar2018-09-161-0/+2
| | | | | Problem: No event triggered after updating diffs. Solution: Add the DiffUpdated event.
* patch 8.1.0395: compiler warning on 64-bit MS-Windowsv8.1.0395Bram Moolenaar2018-09-161-1/+1
| | | | | Problem: Compiler warning on 64-bit MS-Windows. Solution: Add type cast. (Mike Williams)
* patch 8.1.0394: diffs are not always updated correctlyv8.1.0394Bram Moolenaar2018-09-161-5/+15
| | | | | Problem: Diffs are not always updated correctly. Solution: When using internal diff update for any changes properly.
* patch 8.1.0393: not all white space difference options availablev8.1.0393Bram Moolenaar2018-09-151-19/+61
| | | | | Problem: Not all white space difference options available. Solution: Add "iblank", "iwhiteall" and "iwhiteeol" to 'diffopt'.
* patch 8.1.0377: xdiff doesn't use the Vim memory allocation functionsv8.1.0377Bram Moolenaar2018-09-131-2/+2
| | | | | | Problem: Xdiff doesn't use the Vim memory allocation functions. Solution: Change the xdl_ defines. Check for out-of-memory. Rename "ignored" to "vim_ignored".
* patch 8.1.0375: cannot use diff mode with Cygwin diff.exev8.1.0375Bram Moolenaar2018-09-131-0/+4
| | | | | Problem: Cannot use diff mode with Cygwin diff.exe. (Igor Forca) Solution: Skip over unrecognized lines in the diff output.
* patch 8.1.0370: not using internal diff if 'diffopt' is not changedv8.1.0370Bram Moolenaar2018-09-121-1/+1
| | | | | Problem: Not using internal diff if 'diffopt' is not changed. Solution: Correct initialization of diff_flags. (Christian Brabandt)
* patch 8.1.0360: using an external diff program is slow and inflexiblev8.1.0360Bram Moolenaar2018-09-101-181/+632
| | | | | | Problem: Using an external diff program is slow and inflexible. Solution: Include the xdiff library. (Christian Brabandt, closes #2732) Use it by default.
* patch 8.1.0027: difficult to make a plugin that feeds a line to a jobv8.1.0027Bram Moolenaar2018-06-031-0/+7
| | | | | Problem: Difficult to make a plugin that feeds a line to a job. Solution: Add the nitial code for the "prompt" buftype.
* patch 8.0.1773: dialog messages are not translatedv8.0.1773Bram Moolenaar2018-04-291-1/+2
| | | | | Problem: Dialog messages are not translated. Solution: Add N_() and _() where needed. (Sergey Alyoshin)
* patch 8.0.1566: too many #ifdefsv8.0.1566Bram Moolenaar2018-03-041-16/+0
| | | | | Problem: Too many #ifdefs. Solution: Graduate FEAT_SCROLLBIND and FEAT_CURSORBIND.
* patch 8.0.1564: too many #ifdefsv8.0.1564Bram Moolenaar2018-03-041-10/+0
| | | | | | Problem: Too many #ifdefs. Solution: Graduate the +autocmd feature. Takes away 450 #ifdefs and increases code size of tiny Vim by only 40 Kbyte.
* patch 8.0.1361: some users don't want to diff with hidden buffersv8.0.1361Bram Moolenaar2017-12-011-0/+15
| | | | | Problem: Some users don't want to diff with hidden buffers. Solution: Add the "hiddenoff" item to 'diffopt'. (Alisue, closes #2394)
* patch 8.0.1056: cannot build with +diff but without +multi_bytev8.0.1056Bram Moolenaar2017-09-041-4/+0
| | | | | | Problem: Cannot build with the diff feature but without the mutli-byte feature. Solution: Remove #ifdefs. (John Marriott)
* patch 8.0.1046: code duplication in diff modev8.0.1046Bram Moolenaar2017-09-031-57/+37
| | | | | Problem: Code duplication in diff mode. Solution: Use diff_equal_char() also in diff_cmp(). (Rick Howe)
* patch 8.0.1037: "icase" of 'diffopt' is not used for highlightingv8.0.1037Bram Moolenaar2017-09-021-6/+51
| | | | | Problem: "icase" of 'diffopt' is not used for highlighting differences. Solution: Also use "icase". (Rick Howe)
* patch 8.0.0736: OptionSet not triggered when entering diff modev8.0.0736Bram Moolenaar2017-07-191-3/+17
| | | | | | | 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)
* patch 8.0.0599: diff mode is insufficiently testedv8.0.0599Bram Moolenaar2017-05-161-1/+2
| | | | | Problem: diff mode is insufficiently tested Solution: Add more test cases. (Dominique Pelle, closes #1685)
* patch 8.0.0452: some macros are in lower casev8.0.0452Bram Moolenaar2017-03-121-8/+8
| | | | | Problem: Some macros are in lower case. Solution: Make a few more macros upper case.
* patch 8.0.0448: some macros are in lower casev8.0.0448Bram Moolenaar2017-03-121-1/+1
| | | | | Problem: Some macros are in lower case, which can be confusing. Solution: Make a few lower case macros upper case.
* patch 8.0.0444: diffpatch fails when the file name has a quotev8.0.0444Bram Moolenaar2017-03-111-14/+10
| | | | | Problem: Diffpatch fails when the file name has a quote. Solution: Escape the name properly. (zetzei)
* patch 8.0.0442: patch shell command not well escapedv8.0.0442Bram Moolenaar2017-03-091-1/+6
| | | | | | 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)
* patch 8.0.0425: build errors when building without foldingv8.0.0425Bram Moolenaar2017-03-051-2/+0
| | | | | Problem: Build errors when building without folding. Solution: Add #ifdefs. (John Marriott)
* patch 8.0.0300: cannot stop diffing hidden buffersv8.0.0300Bram Moolenaar2017-02-031-0/+21
| | | | | | Problem: Cannot stop diffing hidden buffers. (Daniel Hahler) Solution: When using :diffoff! make the whole list if diffed buffers empty. (closes #736)
* patch 8.0.0044v8.0.0044Bram Moolenaar2016-10-181-30/+32
| | | | | | 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.
* patch 7.4.2293v7.4.2293Bram Moolenaar2016-08-291-1/+1
| | | | | Problem: Modelines in source code are inconsistant. Solution: Use the same line in most files. Add 'noet'. (Naruhiko Nishino)
* patch 7.4.2279v7.4.2279Bram Moolenaar2016-08-281-0/+7
| | | | | | 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.
* patch 7.4.2275v7.4.2275Bram Moolenaar2016-08-271-2/+6
| | | | | Problem: ":diffoff!" does not remove filler lines. Solution: Force a redraw and invalidate the cursor. (closes #1014)
* patch 7.4.2135v7.4.2135Bram Moolenaar2016-07-311-1/+1
| | | | | Problem: Various tiny issues. Solution: Update comments, white space, etc.
* patch 7.4.2101v7.4.2101Bram Moolenaar2016-07-241-9/+9
| | | | | Problem: Looping over windows, buffers and tab pages is inconsistant. Solution: Use FOR_ALL_ macros everywhere. (Yegappan Lakshmanan)
* patch 7.4.2024v7.4.2024Bram Moolenaar2016-07-101-4/+6
| | | | | Problem: More buf_valid() calls can be optimized. Solution: Use bufref_valid() instead.
* patch 7.4.1975v7.4.1975Bram Moolenaar2016-07-011-1/+1
| | | | | | 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)
* patch 7.4.1476v7.4.1476Bram Moolenaar2016-03-031-1/+1
| | | | | Problem: Function arguments marked as unused while they are not. Solution: Remove UNUSED. (Yegappan Lakshmanan)
* patch 7.4.1399v7.4.1399Bram Moolenaar2016-02-231-4/+4
| | | | | Problem: The MS-DOS code does not build. Solution: Remove the old MS-DOS code.
* patch 7.4.1205v7.4.1205Bram Moolenaar2016-01-301-115/+71
| | | | | | Problem: Using old style function declarations. Solution: Change to new style function declarations. (script by Hirohito Higashi)
* patch 7.4.1196v7.4.1196Bram Moolenaar2016-01-291-14/+14
| | | | | Problem: Still using __ARGS. Solution: Remove __ARGS in several files. (script by Hirohito Higashi)
* patch 7.4.974v7.4.974Bram Moolenaar2015-12-171-3/+13
| | | | | | 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.810v7.4.810Bram Moolenaar2015-08-041-2/+2
| | | | | | Problem: With a sequence of commands using buffers in diff mode E749 is given. (itchyny) Solution: Skip unloaded buffer. (Hirohito Higashi)
* patch 7.4.768v7.4.768Bram Moolenaar2015-07-031-45/+38
| | | | | Problem: :diffoff only works properly once. Solution: Also make :diffoff work when used a second time. (Olaf Dabrunz)