diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-11-19 22:05:22 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-11-19 22:05:22 +0300 |
| commit | 03a129aacf7e4b77ceaccc71251ecb5bf41d2a8f (patch) | |
| tree | a3a05c99fe20de98aafbdea9314aa0d76f71aee9 /src/nvim/ex_docmd.c | |
| parent | 6ea3a08fdbb276fe64dda60c5fb934360327ed39 (diff) | |
| parent | de8b1fd1dee5a91b2893fccc53cfd11631ccba38 (diff) | |
| download | rneovim-03a129aacf7e4b77ceaccc71251ecb5bf41d2a8f.tar.gz rneovim-03a129aacf7e4b77ceaccc71251ecb5bf41d2a8f.tar.bz2 rneovim-03a129aacf7e4b77ceaccc71251ecb5bf41d2a8f.zip | |
Merge branch 'master' into expression-parser
Diffstat (limited to 'src/nvim/ex_docmd.c')
| -rw-r--r-- | src/nvim/ex_docmd.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 3bcea4b666..3202f8a848 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -3272,6 +3272,12 @@ const char * set_one_cmd_context( case CMD_echoerr: case CMD_call: case CMD_return: + case CMD_cexpr: + case CMD_caddexpr: + case CMD_cgetexpr: + case CMD_lexpr: + case CMD_laddexpr: + case CMD_lgetexpr: set_context_for_expression(xp, (char_u *)arg, ea.cmdidx); break; @@ -9351,15 +9357,18 @@ put_view ( } } - /* - * Local directory. - */ - if (wp->w_localdir != NULL) { + // + // Local directory, if the current flag is not view options or the "curdir" + // option is included. + // + if (wp->w_localdir != NULL + && (flagp != &vop_flags || (*flagp & SSOP_CURDIR))) { if (fputs("lcd ", fd) < 0 || ses_put_fname(fd, wp->w_localdir, flagp) == FAIL - || put_eol(fd) == FAIL) + || put_eol(fd) == FAIL) { return FAIL; - did_lcd = TRUE; + } + did_lcd = true; } return OK; |