aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-12-30 15:31:38 -0500
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-12-30 15:55:18 -0500
commitbc8f2fdca47c234597d8cfdfd097665df2992c2e (patch)
treed90c8c5a0052ca16bca647d346032e145e195eda
parent3ea77f50cbf132bda9c18164f3b5712e15e228c8 (diff)
downloadrneovim-bc8f2fdca47c234597d8cfdfd097665df2992c2e.tar.gz
rneovim-bc8f2fdca47c234597d8cfdfd097665df2992c2e.tar.bz2
rneovim-bc8f2fdca47c234597d8cfdfd097665df2992c2e.zip
vim-patch:8.1.1727: code for viminfo support is spread out
Problem: Code for viminfo support is spread out. Solution: Move to code to viminfo.c. (Yegappan Lakshmanan, closes vim/vim#4686) https://github.com/vim/vim/commit/defa067c54874dd987121dd7252c62755e0aebfa N/A patches for version.c: vim-patch:8.1.1230: a lot of code is shared between vim.exe and gvim.exe Problem: A lot of code is shared between vim.exe and gvim.exe. Solution: Optionally put the shared code in vim.dll. (Ken Takata, closes vim/vim#4287) https://github.com/vim/vim/commit/afde13b62b8fa25dac4635d5caee8d088b937ee0 vim-patch:8.2.2247: VMS: various smaller problems Problem: VMS: various smaller problems. Solution: Fix VMS building and other problems. (Zoltan Arpadffy) https://github.com/vim/vim/commit/467676d468cb10db78d79d5bd2139ded9f70d26f
-rw-r--r--src/nvim/eval.c3
-rw-r--r--src/nvim/globals.h2
2 files changed, 2 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