aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.1.0929: no error when requesting ConPTY but it's not available

Browse Source 
Problem:    No error when requesting ConPTY but it's not available.
Solution:   Add an error message. (Hirohito Higashi, closes #3967)
This commit is contained in:
Bram Moolenaar
2019-02-16 13:35:13 +01:00
parent d634024b90
commit 5acd987258
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/terminal.c
View File

@@ -5620,10 +5620,8 @@ void (WINAPI *pDeleteProcThreadAttributeList)(LPPROC_THREAD_ATTRIBUTE_LIST);
static int
dyn_conpty_init(int verbose)
{
static BOOL handled = FALSE;
static int result;
HMODULE hKerneldll;
int i;
static HMODULE hKerneldll = NULL;
int i;
static struct
{
char *name;
@@ -5642,16 +5640,17 @@ dyn_conpty_init(int verbose)
{NULL, NULL}
};
if (handled)
return result;
if (!has_conpty_working())
{
handled = TRUE;
result = FAIL;
if (verbose)
emsg(_("E982: ConPTY is not available"));
return FAIL;
}
// No need to initialize twice.
if (hKerneldll)
return OK;
hKerneldll = vimLoadLib("kernel32.dll");
for (i = 0; conpty_entry[i].name != NULL
&& conpty_entry[i].ptr != NULL; ++i)
@@ -5661,12 +5660,11 @@ dyn_conpty_init(int verbose)
{
if (verbose)
semsg(_(e_loadfunc), conpty_entry[i].name);
hKerneldll = NULL;
return FAIL;
}
}
handled = TRUE;
result = OK;
return OK;
}
@@ -6015,6 +6013,7 @@ dyn_winpty_init(int verbose)
{
if (verbose)
semsg(_(e_loadfunc), winpty_entry[i].name);
hWinPtyDLL = NULL;
return FAIL;
}
}