diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-06-24 22:58:06 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-06-24 22:58:06 +0000 |
| commit | 8c8de839325eda0bed68917d18179d2003b344d1 (patch) | |
| tree | c65b80f0a627f2e77385a07a62ee4206465cbc22 /src/ex_cmds.c | |
| parent | 864207de089119377a1e1e5d411307d8eb57399e (diff) | |
updated for version 7.2av7.2a
Diffstat (limited to 'src/ex_cmds.c')
| -rw-r--r-- | src/ex_cmds.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 218ced0f76..6425ac0434 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -11,10 +11,11 @@ * ex_cmds.c: some functions for command line commands */ -#include "vim.h" -#ifdef HAVE_FCNTL_H -# include <fcntl.h> +#if defined(MSDOS) || defined(MSWIN) +# include "vimio.h" /* for mch_open(), must be before vim.h */ #endif + +#include "vim.h" #include "version.h" #ifdef FEAT_EX_EXTRA @@ -977,7 +978,7 @@ do_bang(addr_count, eap, forceit, do_in, do_out) ) { if (p > newcmd && p[-1] == '\\') - mch_memmove(p - 1, p, (size_t)(STRLEN(p) + 1)); + STRMOVE(p - 1, p); else { trailarg = p; @@ -4895,7 +4896,7 @@ do_sub(eap) for (p1 = new_end; *p1; ++p1) { if (p1[0] == '\\' && p1[1] != NUL) /* remove backslash */ - mch_memmove(p1, p1 + 1, STRLEN(p1)); + STRMOVE(p1, p1 + 1); else if (*p1 == CAR) { if (u_inssub(lnum) == OK) /* prepare for undo */ @@ -4919,7 +4920,7 @@ do_sub(eap) /* move the cursor to the new line, like Vi */ ++curwin->w_cursor.lnum; /* copy the rest */ - mch_memmove(new_start, p1 + 1, STRLEN(p1 + 1) + 1); + STRMOVE(new_start, p1 + 1); p1 = new_start - 1; } } |