diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-12-30 20:34:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-30 20:34:56 -0500 |
| commit | 00247ecadc03df6791a9d5d1b971b01fc8ea6e2f (patch) | |
| tree | fac5fb5ef454c73c5a10bfa6ff34c972e7dc6dbf /src | |
| parent | fd507e2788b93f3d0e5330a5a7b496d15fd38343 (diff) | |
| parent | bc8f2fdca47c234597d8cfdfd097665df2992c2e (diff) | |
| download | rneovim-00247ecadc03df6791a9d5d1b971b01fc8ea6e2f.tar.gz rneovim-00247ecadc03df6791a9d5d1b971b01fc8ea6e2f.tar.bz2 rneovim-00247ecadc03df6791a9d5d1b971b01fc8ea6e2f.zip | |
Merge pull request #13646 from janlazo/vim-8.2.2247
vim-patch:8.1.{172,1230,1727},8.2.2247
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 3 | ||||
| -rw-r--r-- | src/nvim/globals.h | 2 | ||||
| -rw-r--r-- | src/nvim/options.lua | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 7916e3a66a..f60504de5e 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -76,9 +76,6 @@ static char_u * const namespace_char = (char_u *)"abglstvw"; /// Variable used for g: static ScopeDictDictItem globvars_var; -/// g: value -#define globvarht globvardict.dv_hashtab - /* * Old Vim variables such as "v:version" are also available without the "v:". * Also in functions. We need a special hashtable for them. diff --git a/src/nvim/globals.h b/src/nvim/globals.h index 6b962dc1f6..d0c00c1d59 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -216,6 +216,8 @@ EXTERN bool emsg_severe INIT(= false); // use message of next of several EXTERN int did_endif INIT(= false); // just had ":endif" EXTERN dict_T vimvardict; // Dictionary with v: variables EXTERN dict_T globvardict; // Dictionary with g: variables +/// g: value +#define globvarht globvardict.dv_hashtab EXTERN int did_emsg; // set by emsg() when the message // is displayed or thrown EXTERN bool called_vim_beep; // set if vim_beep() is called diff --git a/src/nvim/options.lua b/src/nvim/options.lua index 64a09dc2b4..df2bfbce34 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -2313,6 +2313,7 @@ return { deny_duplicates=true, vi_def=true, secure=true, + expand=true, varname='p_shadafile', defaults={if_true={vi=""}} }, |