diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-11-21 17:47:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-21 17:47:09 -0500 |
| commit | 0d967f0298a355452f62b9c76c34e102a6b9016e (patch) | |
| tree | 467949d95f8bb1791a31c7439846bf6d2755d3e1 /src/nvim/eval/funcs.c | |
| parent | d99d4af7b129032865cb5a4fd8e6999e73460fb0 (diff) | |
| parent | 349b9ce9df0c7f48ce236216ab0d2c507f483425 (diff) | |
| download | rneovim-0d967f0298a355452f62b9c76c34e102a6b9016e.tar.gz rneovim-0d967f0298a355452f62b9c76c34e102a6b9016e.tar.bz2 rneovim-0d967f0298a355452f62b9c76c34e102a6b9016e.zip | |
Merge pull request #16362 from zeertzjq/vim-8.2.3617
vim-patch:8.2.{3468,3617,3618,3622}: some other CWD related patches
Diffstat (limited to 'src/nvim/eval/funcs.c')
| -rw-r--r-- | src/nvim/eval/funcs.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 10d53651cb..dfadd28ebe 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -3487,11 +3487,6 @@ static void f_getcwd(typval_T *argvars, typval_T *rettv, FunPtr fptr) } } - // If the user didn't specify anything, default to window scope - if (scope == kCdScopeInvalid) { - scope = MIN_CD_SCOPE; - } - // Find the tabpage by number if (scope_number[kCdScopeTabpage] > 0) { tp = find_tabpage(scope_number[kCdScopeTabpage]); @@ -3537,12 +3532,13 @@ static void f_getcwd(typval_T *argvars, typval_T *rettv, FunPtr fptr) case kCdScopeGlobal: if (globaldir) { // `globaldir` is not always set. from = globaldir; - } else if (os_dirname(cwd, MAXPATHL) == FAIL) { // Get the OS CWD. + break; + } + FALLTHROUGH; // In global directory, just need to get OS CWD. + case kCdScopeInvalid: // If called without any arguments, get OS CWD. + if (os_dirname(cwd, MAXPATHL) == FAIL) { from = (char_u *)""; // Return empty string on failure. } - break; - case kCdScopeInvalid: // We should never get here - abort(); } if (from) { |