forked from aniani/vim
updated for version 7.0145
This commit is contained in:
@@ -3861,6 +3861,9 @@ gui_do_scroll()
|
||||
#endif
|
||||
}
|
||||
|
||||
/* Make sure wp->w_leftcol and wp->w_skipcol are correct. */
|
||||
validate_cursor();
|
||||
|
||||
curwin = save_wp;
|
||||
curbuf = save_wp->w_buffer;
|
||||
|
||||
@@ -3869,6 +3872,7 @@ gui_do_scroll()
|
||||
* the status line!).
|
||||
*/
|
||||
if (old_topline != wp->w_topline
|
||||
|| wp->w_redr_type != 0
|
||||
#ifdef FEAT_DIFF
|
||||
|| old_topfill != wp->w_topfill
|
||||
#endif
|
||||
|
||||
@@ -2401,6 +2401,7 @@ fill_foldcolumn(p, wp, closed, lnum)
|
||||
int i = 0;
|
||||
int level;
|
||||
int first_level;
|
||||
int empty;
|
||||
|
||||
/* Init to all spaces. */
|
||||
copy_spaces(p, (size_t)wp->w_p_fdc);
|
||||
@@ -2408,13 +2409,16 @@ fill_foldcolumn(p, wp, closed, lnum)
|
||||
level = win_foldinfo.fi_level;
|
||||
if (level > 0)
|
||||
{
|
||||
/* If there is only one column put more info in it. */
|
||||
empty = (wp->w_p_fdc == 1) ? 0 : 1;
|
||||
|
||||
/* If the column is too narrow, we start at the lowest level that
|
||||
* fits and use numbers to indicated the depth. */
|
||||
first_level = level - wp->w_p_fdc - closed + 2;
|
||||
first_level = level - wp->w_p_fdc - closed + 1 + empty;
|
||||
if (first_level < 1)
|
||||
first_level = 1;
|
||||
|
||||
for (i = 0; i + 1 < wp->w_p_fdc; ++i)
|
||||
for (i = 0; i + empty < wp->w_p_fdc; ++i)
|
||||
{
|
||||
if (win_foldinfo.fi_lnum == lnum
|
||||
&& first_level + i >= win_foldinfo.fi_low_level)
|
||||
|
||||
@@ -36,5 +36,5 @@
|
||||
#define VIM_VERSION_NODOT "vim70aa"
|
||||
#define VIM_VERSION_SHORT "7.0aa"
|
||||
#define VIM_VERSION_MEDIUM "7.0aa ALPHA"
|
||||
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Sep 9)"
|
||||
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Sep 9, compiled "
|
||||
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Sep 10)"
|
||||
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Sep 10, compiled "
|
||||
|
||||
Reference in New Issue
Block a user