diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2022-05-13 01:54:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-12 16:54:44 -0700 |
| commit | 0d5d9e90ab03080b5ca5ff6e7ed5b0a13d9b8a46 (patch) | |
| tree | 4e020e7124391286d6911ef4f08da5f1e2dee6a0 | |
| parent | aaeffba6846bf1e6065be3079e6e9d4310298227 (diff) | |
| download | rneovim-0d5d9e90ab03080b5ca5ff6e7ed5b0a13d9b8a46.tar.gz rneovim-0d5d9e90ab03080b5ca5ff6e7ed5b0a13d9b8a46.tar.bz2 rneovim-0d5d9e90ab03080b5ca5ff6e7ed5b0a13d9b8a46.zip | |
fix(windows): stdpath("state") => "nvim-data" #18546
This was missed in https://github.com/neovim/neovim/pull/15583
| -rw-r--r-- | src/nvim/os/stdpaths.c | 3 | ||||
| -rw-r--r-- | test/functional/options/defaults_spec.lua | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/os/stdpaths.c b/src/nvim/os/stdpaths.c index 5d6ffc1db1..faeb2fe829 100644 --- a/src/nvim/os/stdpaths.c +++ b/src/nvim/os/stdpaths.c @@ -103,7 +103,8 @@ char *get_xdg_home(const XDGVarType idx) if (dir) { #if defined(WIN32) dir = concat_fnames_realloc(dir, - (idx == kXDGDataHome ? "nvim-data" : "nvim"), + ((idx == kXDGDataHome + || idx == kXDGStateHome) ? "nvim-data" : "nvim"), true); #else dir = concat_fnames_realloc(dir, "nvim", true); diff --git a/test/functional/options/defaults_spec.lua b/test/functional/options/defaults_spec.lua index 36a53d8d26..4731df7b95 100644 --- a/test/functional/options/defaults_spec.lua +++ b/test/functional/options/defaults_spec.lua @@ -206,7 +206,7 @@ describe('startup defaults', function() describe('$NVIM_LOG_FILE', function() local xdgdir = 'Xtest-startup-xdg-logpath' - local xdgstatedir = xdgdir..'/nvim' + local xdgstatedir = iswin() and xdgdir..'/nvim-data' or xdgdir..'/nvim' after_each(function() os.remove('Xtest-logpath') rmdir(xdgdir) |