diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-10-04 11:43:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-04 11:43:56 +0200 |
| commit | 79b358facd6ca00f1bd60f30f643aed989698b38 (patch) | |
| tree | 34673ad058e2dd899e87517edff626b1c5bf17a1 /src/nvim/ex_docmd.c | |
| parent | 94e585944dac3a1f7b75641676c4b4a3b2054749 (diff) | |
| parent | c0d835764fbf33b2effc359498e58e8a114444a8 (diff) | |
| download | rneovim-79b358facd6ca00f1bd60f30f643aed989698b38.tar.gz rneovim-79b358facd6ca00f1bd60f30f643aed989698b38.tar.bz2 rneovim-79b358facd6ca00f1bd60f30f643aed989698b38.zip | |
Merge #9078 from janlazo/vim-8.0.1832
Diffstat (limited to 'src/nvim/ex_docmd.c')
| -rw-r--r-- | src/nvim/ex_docmd.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index f8d4e7d980..2a733f5831 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -3260,8 +3260,15 @@ const char * set_one_cmd_context( while ((xp->xp_pattern = (char_u *)strchr(arg, ' ')) != NULL) { arg = (const char *)xp->xp_pattern + 1; } + xp->xp_context = EXPAND_USER_VARS; xp->xp_pattern = (char_u *)arg; + + if (*xp->xp_pattern == '$') { + xp->xp_context = EXPAND_ENV_VARS; + xp->xp_pattern++; + } + break; case CMD_function: @@ -9049,8 +9056,10 @@ makeopens( // cursor can be set. This is done again below. // winminheight and winminwidth need to be set to avoid an error if the // user has set winheight or winwidth. - if (put_line(fd, "set winminheight=1 winminwidth=1 winheight=1 winwidth=1") - == FAIL) { + if (put_line(fd, "set winminheight=0") == FAIL + || put_line(fd, "set winheight=1") == FAIL + || put_line(fd, "set winminwidth=0") == FAIL + || put_line(fd, "set winwidth=1") == FAIL) { return FAIL; } if (nr > 1 && ses_winsizes(fd, restore_size, tab_firstwin) == FAIL) { |