summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2008-04-01 15:14:36 +0000
committervimboss <devnull@localhost>2008-04-01 15:14:36 +0000
commit0c00cd352e59a2e43c8f69c9d7d177411e86f289 (patch)
treea96baaa334a6820956745d818fb8f3e856a3a000
parent0d88487d95bec0e4b8258b4135ad5e5486c0dd29 (diff)
downloadvim-0c00cd352e59a2e43c8f69c9d7d177411e86f289.tar.gz
updated for version 7.1-290v7.1.290v7-1-290
-rw-r--r--src/spell.c16
-rw-r--r--src/version.c2
2 files changed, 12 insertions, 6 deletions
diff --git a/src/spell.c b/src/spell.c
index f45be18c..567c6cd3 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -2268,6 +2268,8 @@ spell_move_to(wp, dir, allwords, curline, attrp)
/*
* For spell checking: concatenate the start of the following line "line" into
* "buf", blanking-out special characters. Copy less then "maxlen" bytes.
+ * Keep the blanks at the start of the next line, this is used in win_line()
+ * to skip those bytes if the word was OK.
*/
void
spell_cat_line(buf, line, maxlen)
@@ -2284,12 +2286,14 @@ spell_cat_line(buf, line, maxlen)
if (*p != NUL)
{
- *buf = ' ';
- vim_strncpy(buf + 1, line, maxlen - 2);
- n = (int)(p - line);
- if (n >= maxlen)
- n = maxlen - 1;
- vim_memset(buf + 1, ' ', n);
+ /* Only worth concatenating if there is something else than spaces to
+ * concatenate. */
+ n = (int)(p - line) + 1;
+ if (n < maxlen - 1)
+ {
+ vim_memset(buf, ' ', n);
+ vim_strncpy(buf + n, p, maxlen - 1 - n);
+ }
}
}
diff --git a/src/version.c b/src/version.c
index f8579033..5a3c77d6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 290,
+/**/
289,
/**/
288,