summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2007-08-14 20:54:49 +0000
committervimboss <devnull@localhost>2007-08-14 20:54:49 +0000
commit126c96f4b370e8cfc9bc648a0dacee71c32f3801 (patch)
treeb1007c941f14428128a5d69c6cef5ed812a1fb0e
parentf53a347d765df8017202c92047f0534755ee1c4d (diff)
downloadvim-126c96f4b370e8cfc9bc648a0dacee71c32f3801.tar.gz
updated for version 7.1-076v7.1.076v7-1-076
-rw-r--r--src/ex_docmd.c3
-rw-r--r--src/normal.c3
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index f12f12e5..5e637919 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -4493,7 +4493,8 @@ separate_nextcmd(eap)
if (eap->argt & (USECTRLV | XFILE))
++p; /* skip CTRL-V and next char */
else
- STRCPY(p, p + 1); /* remove CTRL-V and skip next char */
+ /* remove CTRL-V and skip next char */
+ mch_memmove(p, p + 1, STRLEN(p));
if (*p == NUL) /* stop at NUL after CTRL-V */
break;
}
diff --git a/src/normal.c b/src/normal.c
index 000d2e12..62b5f8c8 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -3760,7 +3760,8 @@ add_to_showcmd(c)
extra_len = (int)STRLEN(p);
overflow = old_len + extra_len - SHOWCMD_COLS;
if (overflow > 0)
- STRCPY(showcmd_buf, showcmd_buf + overflow);
+ mch_memmove(showcmd_buf, showcmd_buf + overflow,
+ old_len - overflow + 1);
STRCAT(showcmd_buf, p);
if (char_avail())
diff --git a/src/version.c b/src/version.c
index 1f98a3b6..7ef03376 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 */
/**/
+ 76,
+/**/
75,
/**/
74,