summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2007-12-07 16:30:42 +0000
committervimboss <devnull@localhost>2007-12-07 16:30:42 +0000
commit616bce471dc384c6b6dec41b34eb9b8ea0b31da5 (patch)
tree83ce9b1af57cfc14246a643458e0ae8b27b17974
parentae9915ffb6a94ed071f9017104e533b5ca4a2131 (diff)
downloadvim-616bce471dc384c6b6dec41b34eb9b8ea0b31da5.tar.gz
updated for version 7.1-170v7.1.170v7-1-170
-rw-r--r--src/getchar.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/getchar.c b/src/getchar.c
index 4d6da38d..0e78a7bd 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -253,8 +253,9 @@ add_buff(buf, s, slen)
return;
}
else if (buf->bh_index != 0)
- STRCPY(buf->bh_first.b_next->b_str,
- buf->bh_first.b_next->b_str + buf->bh_index);
+ mch_memmove(buf->bh_first.b_next->b_str,
+ buf->bh_first.b_next->b_str + buf->bh_index,
+ STRLEN(buf->bh_first.b_next->b_str + buf->bh_index) + 1);
buf->bh_index = 0;
if (buf->bh_space >= (int)slen)
diff --git a/src/version.c b/src/version.c
index 240fd891..c43de885 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 */
/**/
+ 170,
+/**/
169,
/**/
168,