thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1330: MS-Windows: job in terminal can't get back to Vim

Browse Source 
Problem:    MS-Windows: job in terminal can't get back to Vim.
Solution:   set VIM_SERVERNAME in the environment. (Yasuhiro Matsumoto, closes
            #2360)
This commit is contained in:
Bram Moolenaar
2017-11-21 18:11:27 +01:00
parent 5505860152
commit 52dbb5ea7f
6 changed files with 82 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/terminal.c
View File

@@ -3424,12 +3424,10 @@ term_and_job_init(
return FAIL;
if (opt->jo_cwd != NULL)
cwd_wchar = enc_to_utf16(opt->jo_cwd, NULL);
if (opt->jo_env != NULL)
{
ga_init2(&ga_env, (int)sizeof(char*), 20);
win32_build_env(opt->jo_env, &ga_env);
env_wchar = ga_env.ga_data;
}
ga_init2(&ga_env, (int)sizeof(char*), 20);
win32_build_env(opt->jo_env, &ga_env, TRUE);
env_wchar = ga_env.ga_data;
job = job_alloc();
if (job == NULL)
@@ -3531,8 +3529,7 @@ term_and_job_init(
failed:
if (argvar->v_type == VAR_LIST)
vim_free(ga_cmd.ga_data);
if (opt->jo_env != NULL)
vim_free(ga_env.ga_data);
vim_free(ga_env.ga_data);
vim_free(cmd_wchar);
vim_free(cwd_wchar);
if (spawn_config != NULL)