diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-09-24 09:16:59 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-09-24 09:16:59 +0800 |
| commit | 90fc9039ddcadc61d4236bdd2d638d690081e04d (patch) | |
| tree | ecf08d95a7c9459fa5a79202d85e6666c3f5ee88 /src/nvim/ex_docmd.c | |
| parent | 6258e33b114dc4386e608a5cf3a48742757441f7 (diff) | |
| parent | 4bb0e95abbf0a61d383d5261019a2667706c9d39 (diff) | |
| download | rneovim-90fc9039ddcadc61d4236bdd2d638d690081e04d.tar.gz rneovim-90fc9039ddcadc61d4236bdd2d638d690081e04d.tar.bz2 rneovim-90fc9039ddcadc61d4236bdd2d638d690081e04d.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/nvim/ex_docmd.c')
| -rw-r--r-- | src/nvim/ex_docmd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index d1405978b3..47e23b6e80 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -1668,8 +1668,8 @@ static char_u * do_one_cmd(char_u **cmdlinep, if (*ea.cmd == ';') { if (!ea.skip) { curwin->w_cursor.lnum = ea.line2; - // Don't leave the cursor on an illegal line (caused by ';') - check_cursor_lnum(); + // don't leave the cursor on an illegal line or column + check_cursor(); } } else if (*ea.cmd != ',') { break; @@ -1813,7 +1813,7 @@ static char_u * do_one_cmd(char_u **cmdlinep, if (text_locked() && !(ea.argt & CMDWIN) && !IS_USER_CMDIDX(ea.cmdidx)) { // Command not allowed when editing the command line. - errormsg = get_text_locked_msg(); + errormsg = (char_u *)_(get_text_locked_msg()); goto doend; } /* Disallow editing another buffer when "curbuf_lock" is set. @@ -9378,7 +9378,7 @@ ses_arglist ( (void)vim_FullName((char *)s, (char *)buf, MAXPATHL, FALSE); s = buf; } - if (fputs("argadd ", 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) { xfree(buf); return FAIL; |