thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

updated for version 7.4.038

Browse Source 
Problem:    Using "zw" and "zg" when 'spell' is off give a confusing error
            message. (Gary Johnson)
Solution:   Ignore the error when locating the word.  Explicitly mention what
            word was added. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar 2013-09-25 18:54:24 +02:00
parent f211884fa1
commit 134bf07ca0
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/normal.c
View File

@ -5246,8 +5246,12 @@ dozet:
{ {
pos_T pos = curwin->w_cursor; pos_T pos = curwin->w_cursor;
/* Find bad word under the cursor. */ /* Find bad word under the cursor. When 'spell' is
* off this fails and find_ident_under_cursor() is
* used below. */
emsg_off++;
len = spell_move_to(curwin, FORWARD, TRUE, TRUE, NULL); len = spell_move_to(curwin, FORWARD, TRUE, TRUE, NULL);
emsg_off--;
if (len != 0 && curwin->w_cursor.col <= pos.col) if (len != 0 && curwin->w_cursor.col <= pos.col)
ptr = ml_get_pos(&curwin->w_cursor); ptr = ml_get_pos(&curwin->w_cursor);
curwin->w_cursor = pos; curwin->w_cursor = pos;

7
src/spell.c
View File

@ -9479,7 +9479,8 @@ spell_add_word(word, len, bad, idx, undo)
if (undo) if (undo)
{ {
home_replace(NULL, fname, NameBuff, MAXPATHL, TRUE); home_replace(NULL, fname, NameBuff, MAXPATHL, TRUE);
smsg((char_u *)_("Word removed from %s"), NameBuff); smsg((char_u *)_("Word '%.*s' removed from %s"),
len, word, NameBuff);
} }
} }
fseek(fd, fpos_next, SEEK_SET); fseek(fd, fpos_next, SEEK_SET);
@ -9525,7 +9526,7 @@ spell_add_word(word, len, bad, idx, undo)
fclose(fd); fclose(fd);
home_replace(NULL, fname, NameBuff, MAXPATHL, TRUE); home_replace(NULL, fname, NameBuff, MAXPATHL, TRUE);
smsg((char_u *)_("Word added to %s"), NameBuff); smsg((char_u *)_("Word '%.*s' added to %s"), len, word, NameBuff);
} }
} }
@ -10135,7 +10136,7 @@ spell_check_sps()
} }
/* /*
* "z?": Find badly spelled word under or after the cursor. * "z=": Find badly spelled word under or after the cursor.
* Give suggestions for the properly spelled word. * Give suggestions for the properly spelled word.
* In Visual mode use the highlighted word as the bad word. * In Visual mode use the highlighted word as the bad word.
* When "count" is non-zero use that suggestion. * When "count" is non-zero use that suggestion.

2
src/version.c
View File

@ -738,6 +738,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 */
/**/
38,
/**/ /**/
37, 37,
/**/ /**/