aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-12-11 19:45:22 -0500
committerGitHub <noreply@github.com>2020-12-11 19:45:22 -0500
commit062576f679a1bd5cb546bb8081dc97caefe7b51f (patch)
tree8a5252fd8012036a58ba82bf00d9592ab4880506 /src
parenta82bcf9d9cd445dffa5266bb5e2d27a9fcfbe55f (diff)
downloadrneovim-062576f679a1bd5cb546bb8081dc97caefe7b51f.tar.gz
rneovim-062576f679a1bd5cb546bb8081dc97caefe7b51f.tar.bz2
rneovim-062576f679a1bd5cb546bb8081dc97caefe7b51f.zip
vim-patch:8.2.0047: cannot skip tests for specific MS-Windows platform (#13461)
Problem: Cannot skip tests for specific MS-Windows platform. Solution: Add windowsversion(). https://github.com/vim/vim/commit/0c1e3744ff0cd6c17af773046b876b428ff3dded
Diffstat (limited to 'src')
-rw-r--r--src/nvim/eval.lua1
-rw-r--r--src/nvim/eval/funcs.c7
-rw-r--r--src/nvim/globals.h3
-rw-r--r--src/nvim/main.c8
-rw-r--r--src/nvim/testdir/test_options.vim10
5 files changed, 29 insertions, 0 deletions
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
index 9f1994e299..466f1800c7 100644
--- a/src/nvim/eval.lua
+++ b/src/nvim/eval.lua
@@ -392,6 +392,7 @@ return {
win_screenpos={args=1},
winbufnr={args=1},
wincol={},
+ windowsversion={},
winheight={args=1},
winlayout={args={0, 1}},
winline={},
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index 4df935469a..c5fa0f12cc 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -11213,6 +11213,13 @@ static void f_winwidth(typval_T *argvars, typval_T *rettv, FunPtr fptr)
}
}
+// "windowsversion()" function
+static void f_windowsversion(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+ rettv->v_type = VAR_STRING;
+ rettv->vval.v_string = (char_u *)xstrdup(windowsVersion);
+}
+
/// "wordcount()" function
static void f_wordcount(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index 566a5ae9d6..e0853e900f 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -1052,4 +1052,7 @@ typedef enum {
#define MIN_CD_SCOPE kCdScopeWindow
#define MAX_CD_SCOPE kCdScopeGlobal
+// Only filled for Win32.
+EXTERN char windowsVersion[20] INIT(= { 0 });
+
#endif // NVIM_GLOBALS_H
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 025312a6e1..fd8264583b 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -169,6 +169,14 @@ void early_init(mparm_T *paramp)
init_normal_cmds(); // Init the table of Normal mode commands.
highlight_init();
+#ifdef WIN32
+ OSVERSIONINFO ovi;
+ ovi.dwOSVersionInfoSize = sizeof(ovi);
+ GetVersionEx(&ovi);
+ snprintf(windowsVersion, sizeof(windowsVersion), "%d.%d",
+ (int)ovi.dwMajorVersion, (int)ovi.dwMinorVersion);
+#endif
+
#if defined(HAVE_LOCALE_H)
// Setup to use the current locale (for ctype() and many other things).
// NOTE: Translated messages with encodings other than latin1 will not
diff --git a/src/nvim/testdir/test_options.vim b/src/nvim/testdir/test_options.vim
index 15c1836c9a..ccc5e6ffc9 100644
--- a/src/nvim/testdir/test_options.vim
+++ b/src/nvim/testdir/test_options.vim
@@ -348,6 +348,16 @@ func Test_set_values()
endif
endfunc
+func Test_renderoptions()
+ throw 'skipped: Nvim does not support renderoptions'
+ " Only do this for Windows Vista and later, fails on Windows XP and earlier.
+ " Doesn't hurt to do this on a non-Windows system.
+ if windowsversion() !~ '^[345]\.'
+ set renderoptions=type:directx
+ set rop=type:directx
+ endif
+endfunc
+
func ResetIndentexpr()
set indentexpr=
endfunc