mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
updated for version 7.1-251
This commit is contained in:
13
src/screen.c
13
src/screen.c
@@ -2644,7 +2644,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
|
|||||||
#if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \
|
#if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \
|
||||||
|| defined(FEAT_SYN_HL) || defined(FEAT_DIFF)
|
|| defined(FEAT_SYN_HL) || defined(FEAT_DIFF)
|
||||||
# define LINE_ATTR
|
# define LINE_ATTR
|
||||||
int line_attr = 0; /* atrribute for the whole line */
|
int line_attr = 0; /* attribute for the whole line */
|
||||||
#endif
|
#endif
|
||||||
#ifdef FEAT_SEARCH_EXTRA
|
#ifdef FEAT_SEARCH_EXTRA
|
||||||
matchitem_T *cur; /* points to the match list */
|
matchitem_T *cur; /* points to the match list */
|
||||||
@@ -3040,18 +3040,25 @@ win_line(wp, lnum, startrow, endrow, nochange)
|
|||||||
if (has_spell)
|
if (has_spell)
|
||||||
{
|
{
|
||||||
int len;
|
int len;
|
||||||
|
colnr_T linecol = (colnr_T)(ptr - line);
|
||||||
hlf_T spell_hlf = HLF_COUNT;
|
hlf_T spell_hlf = HLF_COUNT;
|
||||||
|
|
||||||
pos = wp->w_cursor;
|
pos = wp->w_cursor;
|
||||||
wp->w_cursor.lnum = lnum;
|
wp->w_cursor.lnum = lnum;
|
||||||
wp->w_cursor.col = (colnr_T)(ptr - line);
|
wp->w_cursor.col = linecol;
|
||||||
len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf);
|
len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf);
|
||||||
|
|
||||||
|
/* spell_move_to() may call ml_get() and make "line" invalid */
|
||||||
|
line = ml_get_buf(wp->w_buffer, lnum, FALSE);
|
||||||
|
ptr = line + linecol;
|
||||||
|
|
||||||
if (len == 0 || (int)wp->w_cursor.col > ptr - line)
|
if (len == 0 || (int)wp->w_cursor.col > ptr - line)
|
||||||
{
|
{
|
||||||
/* no bad word found at line start, don't check until end of a
|
/* no bad word found at line start, don't check until end of a
|
||||||
* word */
|
* word */
|
||||||
spell_hlf = HLF_COUNT;
|
spell_hlf = HLF_COUNT;
|
||||||
word_end = (int)(spell_to_word_end(ptr, wp->w_buffer) - line + 1);
|
word_end = (int)(spell_to_word_end(ptr, wp->w_buffer)
|
||||||
|
- line + 1);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@@ -666,6 +666,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
251,
|
||||||
/**/
|
/**/
|
||||||
250,
|
250,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user