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)
diff --git a/src/normal.c b/src/normal.c
index 4c11a2b..87e979d 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -5246,8 +5246,12 @@
{
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;
diff --git a/src/spell.c b/src/spell.c
index 20344f2..3ee8b02 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -9479,7 +9479,8 @@
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 @@
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 @@
}
/*
- * "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.
diff --git a/src/version.c b/src/version.c
index 08220ef..c7b7332 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 38,
+/**/
37,
/**/
36,
