diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-11-21 18:11:27 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-11-21 18:11:27 +0100 |
| commit | 52dbb5ea7fde4a77178bc59e2383ca40df503812 (patch) | |
| tree | 15ff54bb446f2595defa95bfcafb6616b8d62aff /src/terminal.c | |
| parent | 550586015232ecc4f68b3479fa8ba2cf81c76e7b (diff) | |
| download | vim-git-52dbb5ea7fde4a77178bc59e2383ca40df503812.tar.gz | |
patch 8.0.1330: MS-Windows: job in terminal can't get back to Vimv8.0.1330
Problem: MS-Windows: job in terminal can't get back to Vim.
Solution: set VIM_SERVERNAME in the environment. (Yasuhiro Matsumoto, closes
#2360)
Diffstat (limited to 'src/terminal.c')
| -rw-r--r-- | src/terminal.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/terminal.c b/src/terminal.c index 2e6b39918..716d0b53b 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -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) |