averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-11 15:37:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'vim/master'

Browse Source
This commit is contained in:
Kazuki Sakamoto
2018-10-30 19:45:14 -07:00
parent 0e473839d0 a9a8e04eab
commit 324ff06148
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/memline.c
+2 -2
View File
@@ -5029,8 +5029,8 @@ ml_updatechunk(
curline += buf->b_ml.ml_chunksize[curix].mlcs_numlines;
}
}
else if (line >= curline + buf->b_ml.ml_chunksize[curix].mlcs_numlines
&& curix < buf->b_ml.ml_usedchunks - 1)
else if (curix < buf->b_ml.ml_usedchunks - 1
&& line >= curline + buf->b_ml.ml_chunksize[curix].mlcs_numlines)
{
/* Adjust cached curix & curline */
curline += buf->b_ml.ml_chunksize[curix].mlcs_numlines;
src/version.c
+2
View File
@@ -807,6 +807,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
501,
/**/
500,
/**/