aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

updated for version 7.3.426

Browse Source 
Problem:    With '$' in 'cpoptions' the $ is not displayed in the first
            column.
Solution:   Use -1 instead of 0 as a special value. (Hideki Eiraku and
            Hirohito Higashi)
This commit is contained in:
Bram Moolenaar
2012-02-04 23:35:00 +01:00
parent d87fbc2b1c
commit 76b9b3696c
6 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/screen.c
View File

@@ -1637,11 +1637,11 @@ win_update(wp)
* When at start of changed lines: May scroll following lines
* up or down to minimize redrawing.
* Don't do this when the change continues until the end.
* Don't scroll when dollar_vcol is non-zero, keep the "$".
* Don't scroll when dollar_vcol >= 0, keep the "$".
*/
if (lnum == mod_top
&& mod_bot != MAXLNUM
&& !(dollar_vcol != 0 && mod_bot == mod_top + 1))
&& !(dollar_vcol >= 0 && mod_bot == mod_top + 1))
{
int old_rows = 0;
int new_rows = 0;
@@ -1868,12 +1868,12 @@ win_update(wp)
if (row > wp->w_height) /* past end of screen */
{
/* we may need the size of that too long line later on */
if (dollar_vcol == 0)
if (dollar_vcol == -1)
wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE);
++idx;
break;
}
if (dollar_vcol == 0)
if (dollar_vcol == -1)
wp->w_lines[idx].wl_size = row - srow;
++idx;
#ifdef FEAT_FOLDING
@@ -1990,7 +1990,7 @@ win_update(wp)
}
#endif
}
else if (dollar_vcol == 0)
else if (dollar_vcol == -1)
wp->w_botline = lnum;
/* make sure the rest of the screen is blank */
@@ -2005,7 +2005,7 @@ win_update(wp)
wp->w_old_botfill = wp->w_botfill;
#endif
if (dollar_vcol == 0)
if (dollar_vcol == -1)
{
/*
* There is a trick with w_botline. If we invalidate it on each
@@ -3564,7 +3564,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
}
/* When still displaying '$' of change command, stop at cursor */
if (dollar_vcol != 0 && wp == curwin
if (dollar_vcol >= 0 && wp == curwin
&& lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol
#ifdef FEAT_DIFF
&& filler_todo <= 0