diff options
author | Bram Moolenaar <Bram@vim.org> | 2014-03-12 21:28:26 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2014-03-12 21:28:26 +0100 |
commit | f0bdd2f28db28707385535ac9c270903e16c4637 (patch) | |
tree | e1b517d2c8e98b9eccc780acb1025a359c0200d7 | |
parent | 1d9ff43f585da9dc51c65a8c64bc19b281cc73f6 (diff) | |
download | vim-git-f0bdd2f28db28707385535ac9c270903e16c4637.tar.gz |
updated for version 7.4.205v7.4.205
Problem: ":mksession" writes command to move to second argument while it
does not exist. When it does exist the order might be wrong.
Solution: Use ":argadd" for each argument instead of using ":args" with a
list of names. (Nobuhiro Takasaki)
-rw-r--r-- | src/ex_docmd.c | 14 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 315b17076..e2c972403 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -10381,7 +10381,7 @@ makeopens(fd, dirnow) } /* the global argument list */ - if (ses_arglist(fd, "args", &global_alist.al_ga, + if (ses_arglist(fd, "argglobal", &global_alist.al_ga, !(ssop_flags & SSOP_CURDIR), &ssop_flags) == FAIL) return FAIL; @@ -10955,9 +10955,9 @@ ses_arglist(fd, cmd, gap, fullname, flagp) char_u *buf = NULL; char_u *s; - if (gap->ga_len == 0) - return put_line(fd, "silent! argdel *"); - if (fputs(cmd, fd) < 0) + if (fputs(cmd, fd) < 0 || put_eol(fd) == FAIL) + return FAIL; + if (put_line(fd, "silent! argdel *") == FAIL) return FAIL; for (i = 0; i < gap->ga_len; ++i) { @@ -10974,7 +10974,9 @@ ses_arglist(fd, cmd, gap, fullname, flagp) s = buf; } } - if (fputs(" ", fd) < 0 || ses_put_fname(fd, s, flagp) == FAIL) + if (fputs("argadd ", fd) < 0 + || ses_put_fname(fd, s, flagp) == FAIL + || put_eol(fd) == FAIL) { vim_free(buf); return FAIL; @@ -10982,7 +10984,7 @@ ses_arglist(fd, cmd, gap, fullname, flagp) vim_free(buf); } } - return put_eol(fd); + return OK; } /* diff --git a/src/version.c b/src/version.c index 5a50c2e9d..82817145b 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 205, +/**/ 204, /**/ 203, |