mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-08-14 03:04:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #41224 from justinmk/fixbuild

Browse Source
This commit is contained in:
Justin M. Keyes
2026-08-08 03:59:15 -04:00
committed by GitHub
parent a08607b8d6 9e283f273b
commit e16d577f16
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/context.c
View File

@@ -312,6 +312,7 @@ static void ctx_localdirs_restore(CtxSwitch *cs, win_T *cwp, tabpage_T *tp, bool
/// ('autochdir', win/tab-local directories) can be undone.
/// - kCtxKeepDirs: also copies of the target context's dir scopes (w/b/tp-local, global).
static void ctx_dirs_save(CtxSwitch *cs, win_T *wp, tabpage_T *tp, buf_T *buf)
FUNC_ATTR_NONNULL_ARG(1, 2, 3)
{
if (!(cs->cs_flags & (kCtxKeepCwd | kCtxKeepDirs))) {
return;
@@ -332,8 +333,8 @@ static void ctx_dirs_save(CtxSwitch *cs, win_T *wp, tabpage_T *tp, buf_T *buf)
char cwd[MAXPATHL];
if ((cs->cs_flags & kCtxKeepDirs)
|| (curwin != wp
&& (curwin->w_localdir != NULL || (wp != NULL && wp->w_localdir != NULL)
|| curbuf->b_localdir != NULL || (wp != NULL && wp->w_buffer->b_localdir != NULL)
&& (curwin->w_localdir != NULL || wp->w_localdir != NULL
|| curbuf->b_localdir != NULL || wp->w_buffer->b_localdir != NULL
|| (curtab != tp && (curtab->tp_localdir != NULL || tp->tp_localdir != NULL))
|| p_acd))) {
if (os_dirname(cwd, MAXPATHL) == OK) {
@@ -350,7 +351,7 @@ static void ctx_dirs_save(CtxSwitch *cs, win_T *wp, tabpage_T *tp, buf_T *buf)
do_autochdir();
char autocwd[MAXPATHL];
if (os_dirname(autocwd, MAXPATHL) == OK) {
cs->cs_apply_acd = strcmp(cwd, autocwd) == 0;
cs->cs_apply_acd = strcmp(cs->cs_cwd, autocwd) == 0;
}
}
}
@@ -552,7 +553,7 @@ bool ctx_switch(CtxSwitch *cs, win_T *wp, tabpage_T *tp, buf_T *buf, CtxSwitchFl
}
// The CWD-state snapshot is only for a real window target; hidden-buffer target is handled by the
// ctx_win machinery (ctx_win_prep).
if (buf == NULL || wp != NULL) {
if (wp != NULL) {
ctx_dirs_save(cs, wp, tp == NULL ? curtab : tp, buf);
}

12
test/functional/terminal/ex_terminal_spec.lua
View File

@@ -268,13 +268,13 @@ local function test_terminal_with_fake_shell(backslash)
end)
it('spawns in CWD effective at time of invocation', function()
command('terminal')
-- Run "echo" so the default TermClose handler does not auto-delete an exitcode=0 shell.
command('terminal echo')
local dir = fn.bufname():match('^term://(.-)//')
command('bcd ..') -- :terminal should use this CWD.
command('terminal')
local parent = fn.bufname():match('^term://(.-)//')
neq(dir, parent)
eq(fn.fnamemodify(dir, ':h'), parent)
local parentdir = fn.fnamemodify(fn.getcwd(), ':h') -- Absolute, so 'cdpath' cannot interfere.
command(('bcd %s'):format(fn.fnameescape(parentdir))) -- :terminal should use this CWD.
command('terminal echo')
eq(fn.fnamemodify(dir, ':h'), fn.bufname():match('^term://(.-)//'))
end)
it('allows quotes and slashes', function()