updated for version 7.1-055

diff --git a/src/buffer.c b/src/buffer.c
index 8bd3a3553334d8ce8d64f64ff7ae5cf3a16eccb5..6d44fa74d6bb36f2662da33cd0563b5746d6b6e5 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4860,7 +4860,7 @@ chk_modeline(lnum, flags)
             */
            for (e = s; *e != ':' && *e != NUL; ++e)
                if (e[0] == '\\' && e[1] == ':')
-                   STRCPY(e, e + 1);
+                   mch_memmove(e, e + 1, STRLEN(e));
            if (*e == NUL)
                end = TRUE;
 

diff --git a/src/charset.c b/src/charset.c
index 5436bb40b0fe0fc506fab4985d822552add2d470..8f058bde0ae776b308b2617ee3982cb4586cdcff 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -1898,7 +1898,7 @@ backslash_halve(p)
 {
     for ( ; *p; ++p)
        if (rem_backslash(p))
-           STRCPY(p, p + 1);
+           mch_memmove(p, p + 1, STRLEN(p));
 }
 
 /*

diff --git a/src/eval.c b/src/eval.c
index 1b26747388aba5244ca865edc5926449378c7e1b..30bae9c2efb0163528d19f0c19f8a547ba306e3b 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -13807,7 +13807,7 @@ f_resolve(argvars, rettv)
            }
            /* Shorten "remain". */
            if (*q != NUL)
-               STRCPY(remain, q - 1);
+               mch_memmove(remain, q - 1, STRLEN(q - 1) + 1);
            else
            {
                vim_free(remain);

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 206da806517d4d892ac70cdc2c92d31c341f57f6..3ddec29607b90ca272091e126c63320fe5be2f9f 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -4306,10 +4306,11 @@ ExpandFromContext(xp, pat, num_file, file, options)
                            && pat[i + 1] == '\\'
                            && pat[i + 2] == '\\'
                            && pat[i + 3] == ' ')
-                       STRCPY(pat + i, pat + i + 3);
+                       mch_memmove(pat + i, pat + i + 3,
+                                                    STRLEN(pat + i + 3) + 1);
                    if (xp->xp_backslash == XP_BS_ONE
                            && pat[i + 1] == ' ')
-                       STRCPY(pat + i, pat + i + 1);
+                       mch_memmove(pat + i, pat + i + 1, STRLEN(pat + i));
                }
        }
 
@@ -4552,7 +4553,7 @@ expand_shellcmd(filepat, num_file, file, flagsarg)
     pat = vim_strsave(filepat);
     for (i = 0; pat[i]; ++i)
        if (pat[i] == '\\' && pat[i + 1] == ' ')
-           STRCPY(pat + i, pat + i + 1);
+           mch_memmove(pat + i, pat + i + 1, STRLEN(pat + i));
 
     flags |= EW_FILE | EW_EXEC;
 

diff --git a/src/misc1.c b/src/misc1.c
index 816c9471d8e04b5995d87ec62005930b4eab666d..be2c2444344b0ca3dc29542b918fe6d39c50993e 100644 (file)
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -8635,7 +8635,7 @@ dos_expandpath(
     for (p = buf + wildoff; p < s; ++p)
        if (rem_backslash(p))
        {
-           STRCPY(p, p + 1);
+           mch_memmove(p, p + 1, STRLEN(p));
            --e;
            --s;
        }
@@ -8936,7 +8936,7 @@ unix_expandpath(gap, path, wildoff, flags, didstar)
     for (p = buf + wildoff; p < s; ++p)
        if (rem_backslash(p))
        {
-           STRCPY(p, p + 1);
+           mch_memmove(p, p + 1, STRLEN(p));
            --e;
            --s;
        }

diff --git a/src/regexp.c b/src/regexp.c
index 071663f66fbcda894a03c258ab04cef4fbc7fd68..6db9139269d8e4c1eb2590657b1da58f77a58f03 100644 (file)
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -6637,9 +6637,9 @@ regtilde(source, magic)
                }
            }
            else if (magic)
-               STRCPY(p, p + 1);               /* remove '~' */
+               mch_memmove(p, p + 1, STRLEN(p));       /* remove '~' */
            else
-               STRCPY(p, p + 2);               /* remove '\~' */
+               mch_memmove(p, p + 2, STRLEN(p) - 1);   /* remove '\~' */
            --p;
        }
        else

diff --git a/src/termlib.c b/src/termlib.c
index 2091115d77163c8ceeeae3e6f745ffa055af252b..33f332a54681ed356189a0c354399663d5e4fc3e 100644 (file)
--- a/src/termlib.c
+++ b/src/termlib.c
@@ -191,7 +191,7 @@ nextent(tbuf, termcap, buflen)              /* Read 1 entry from TERMCAP file */
            lbuf[0] == '\t' &&
            lbuf[1] == ':')
        {
-           strcpy(lbuf, lbuf+2);
+           mch_memmove(lbuf, lbuf + 2, strlen(lbuf + 2) + 1);
            llen -= 2;
        }
        if (lbuf[llen-2] == '\\')               /* and continuations */

diff --git a/src/version.c b/src/version.c
index d486d60bf71c1adf1d96ed6a0fa75c4ce6292063..5be707f1223dc186b3284b01609c3da26851f06c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    55,
 /**/
     54,
 /**/