diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-07-23 03:18:10 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-07-23 03:18:10 +0200 |
| commit | 2000b6a64a9c1fe47d07d8441620abceaf545094 (patch) | |
| tree | f622935d39e546f7ac4a66148b3ae5b9af622e53 /src | |
| parent | cdbfdcfcc484340f89a0bf3bd2e97dcf95f15625 (diff) | |
| parent | 03bd5a4b91f4b555be9fc44b7fab6a64923667c8 (diff) | |
| download | rneovim-2000b6a64a9c1fe47d07d8441620abceaf545094.tar.gz rneovim-2000b6a64a9c1fe47d07d8441620abceaf545094.tar.bz2 rneovim-2000b6a64a9c1fe47d07d8441620abceaf545094.zip | |
Merge #8589 'VimL: Remove legacy v:xx aliases'
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 6 | ||||
| -rw-r--r-- | src/nvim/ex_docmd.c | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index e6880f58e7..36662b2a39 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -344,11 +344,11 @@ static struct vimvar { VV(VV_COUNT, "count", VAR_NUMBER, VV_RO), VV(VV_COUNT1, "count1", VAR_NUMBER, VV_RO), VV(VV_PREVCOUNT, "prevcount", VAR_NUMBER, VV_RO), - VV(VV_ERRMSG, "errmsg", VAR_STRING, VV_COMPAT), + VV(VV_ERRMSG, "errmsg", VAR_STRING, 0), VV(VV_WARNINGMSG, "warningmsg", VAR_STRING, 0), VV(VV_STATUSMSG, "statusmsg", VAR_STRING, 0), - VV(VV_SHELL_ERROR, "shell_error", VAR_NUMBER, VV_COMPAT+VV_RO), - VV(VV_THIS_SESSION, "this_session", VAR_STRING, VV_COMPAT), + VV(VV_SHELL_ERROR, "shell_error", VAR_NUMBER, VV_RO), + VV(VV_THIS_SESSION, "this_session", VAR_STRING, 0), VV(VV_VERSION, "version", VAR_NUMBER, VV_COMPAT+VV_RO), VV(VV_LNUM, "lnum", VAR_NUMBER, VV_RO_SBX), VV(VV_TERMRESPONSE, "termresponse", VAR_STRING, VV_RO), diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index b077aefa1e..97369c50d9 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -7920,7 +7920,7 @@ static void ex_mkrc(exarg_T *eap) if (failed) { EMSG(_(e_write)); } else if (eap->cmdidx == CMD_mksession) { - // successful session write - set this_session var + // successful session write - set v:this_session char *const tbuf = xmalloc(MAXPATHL); if (vim_FullName(fname, tbuf, MAXPATHL, false) == OK) { set_vim_var_string(VV_THIS_SESSION, tbuf, -1); @@ -8784,15 +8784,15 @@ makeopens( if (ssop_flags & SSOP_BUFFERS) only_save_windows = FALSE; /* Save ALL buffers */ - /* - * Begin by setting the this_session variable, and then other - * sessionable variables. - */ - if (put_line(fd, "let v:this_session=expand(\"<sfile>:p\")") == FAIL) + // Begin by setting v:this_session, and then other sessionable variables. + if (put_line(fd, "let v:this_session=expand(\"<sfile>:p\")") == FAIL) { return FAIL; - if (ssop_flags & SSOP_GLOBALS) - if (store_session_globals(fd) == FAIL) + } + if (ssop_flags & SSOP_GLOBALS) { + if (store_session_globals(fd) == FAIL) { return FAIL; + } + } /* * Close all windows but one. |