Mercurial > vim
changeset 5374:6daa78b6b99a v7.4.038
updated for version 7.4.038
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)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 25 Sep 2013 18:54:24 +0200 |
| parents | 4cebff334430 |
| children | 5409c616bfd0 |
| files | src/normal.c src/spell.c src/version.c |
| diffstat | 3 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/normal.c +++ b/src/normal.c @@ -5246,8 +5246,12 @@ dozet: { 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); + emsg_off--; if (len != 0 && curwin->w_cursor.col <= pos.col) ptr = ml_get_pos(&curwin->w_cursor); curwin->w_cursor = pos;
--- a/src/spell.c +++ b/src/spell.c @@ -9479,7 +9479,8 @@ spell_add_word(word, len, bad, idx, undo if (undo) { 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); @@ -9525,7 +9526,7 @@ spell_add_word(word, len, bad, idx, undo fclose(fd); 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. * In Visual mode use the highlighted word as the bad word. * When "count" is non-zero use that suggestion.