summaryrefslogtreecommitdiff
path: root/src/diff.c
Commit message (Collapse)AuthorAgeFilesLines
* 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)
* updated for version 7.4.684v7.4.684Bram Moolenaar2015-03-311-5/+5
| | | | | | 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.
* updated for version 7.4.490v7.4.490Bram Moolenaar2014-10-311-2/+10
| | | | | | 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)
* updated for version 7.4.477v7.4.477Bram Moolenaar2014-10-151-1/+1
| | | | | | Problem: When using ":%diffput" and the other file is empty an extra empty line remains. Solution: Set the buf_empty flag.
* updated for version 7.4.308v7.4.308Bram Moolenaar2014-05-281-0/+1
| | | | | | Problem: When using ":diffsplit" on an empty file the cursor is displayed on the command line. Solution: Limit the value of w_topfill.
* updated for version 7.4.031v7.4.031Bram Moolenaar2013-09-201-1/+1
| | | | | | Problem: ":diffoff!" resets options even when 'diff' is not set. (Charles Cooper) Solution: Only resets related options in a window where 'diff' is set.
* updated for version 7.4a.026v7.4a.026Bram Moolenaar2013-07-171-2/+11
| | | | | Problem: ":diffoff" does not remove folds. (Ramel) Solution: Do not restore 'foldenable' when 'foldmethod' is "manual".
* updated for version 7.3.1294v7.3.1294Bram Moolenaar2013-07-031-7/+47
| | | | | Problem: ":diffoff" resets options. Solution: Save and restore option values. (Christian Brabandt)
* updated for version 7.3.925v7.3.925Bram Moolenaar2013-05-061-1/+1
| | | | | Problem: Typos in source files. Solution: Fix the typos. (Ken Takata)
* updated for version 7.3.869v7.3.869Bram Moolenaar2013-03-191-1/+1
| | | | | | Problem: bufwinnr() matches buffers in other tabs. Solution: For bufwinnr() and ? only match buffers in the current tab. (Alexey Radkov)
* updated for version 7.3.708v7.3.708Bram Moolenaar2012-10-211-2/+4
| | | | | Problem: Filler lines above the first line may be hidden when opening Vim. Solution: Change how topfill is computed. (Christian Brabandt)
* updated for version 7.3.523v7.3.523Bram Moolenaar2012-05-181-0/+9
| | | | | Problem: ":diffupdate" doesn't check for files changed elsewhere. Solution: Add the ! flag. (Christian Brabandt)
* updated for version 7.3.008v7.3.008Bram Moolenaar2010-09-211-6/+5
| | | | | Problem: 'cursorbind' is kept in places where 'scrollbind' is reset. Solution: Reset 'cursorbind'.
* Fixes for coverity warnings.Bram Moolenaar2010-07-311-1/+4
|
* Add the conceal patch from Vince Negri.Bram Moolenaar2010-06-051-0/+75
|
* updated for version 7.2.370v7.2.370Bram Moolenaar2010-02-241-15/+20
| | | | | Problem: A redraw may cause folds to be closed. Solution: Revert part of the previous patch. Add a test. (Lech Lorens)
* updated for version 7.2-239v7.2.239Bram Moolenaar2009-07-221-26/+34
|
* updated for version 7.2-173v7.2.173Bram Moolenaar2009-05-141-4/+2
|
* updated for version 7.2-169v7.2.169Bram Moolenaar2009-05-131-7/+12
|
* updated for version 7.2-133v7.2.133Bram Moolenaar2009-03-111-1/+1
|
* updated for version 7.2-086v7.2.086Bram Moolenaar2009-01-221-3/+5
|
* updated for version 7.2-059v7.2.059Bram Moolenaar2008-11-301-0/+4
|
* updated for version 7.2-055v7.2.055Bram Moolenaar2008-11-281-7/+18
|
* updated for version 7.1-234v7.1.234Bram Moolenaar2008-01-181-23/+57
|
* updated for version 7.1-144v7.1.144Bram Moolenaar2007-10-191-0/+3
|
* updated for version 7.1-143v7.1.143Bram Moolenaar2007-10-191-1/+1
|
* updated for version 7.1-125v7.1.125Bram Moolenaar2007-09-291-4/+4
|
* updated for version 7.0-201v7.0.201Bram Moolenaar2007-02-201-5/+12
|
* updated for version 7.0-200v7.0.200Bram Moolenaar2007-02-201-0/+6
|
* updated for version 7.0e06v7.0e06Bram Moolenaar2006-04-221-1/+2
|
* updated for version 7.0e01v7.0e01Bram Moolenaar2006-04-171-2/+2
|
* updated for version 7.0d04v7.0d04Bram Moolenaar2006-04-141-14/+47
|
* updated for version 7.0d03v7.0d03Bram Moolenaar2006-04-131-0/+12
|
* updated for version 7.0dv7.0dBram Moolenaar2006-04-101-1/+1
|
* updated for version 7.0c10v7.0c10Bram Moolenaar2006-04-051-3/+19
|
* updated for version 7.0225Bram Moolenaar2006-03-151-3/+35
|