aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.1.0615: get_tv function names are not consistent

Browse Source 
Problem:    Get_tv function names are not consistent.
Solution:   Rename to tv_get.
This commit is contained in:
Bram Moolenaar
2018-12-21 16:04:21 +01:00
parent 162b71479b
commit d155d7a851
20 changed files with 637 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/os_unix.c
View File

@@ -1678,13 +1678,13 @@ x_IOerror_check(Display *dpy UNUSED)
/*
* An X IO Error handler, used to catch terminal errors.
*/
static int xterm_dpy_was_reset = FALSE;
static int xterm_dpy_retry_count = 0;
static int
x_IOerror_handler(Display *dpy UNUSED)
{
xterm_dpy = NULL;
xterm_dpy_was_reset = TRUE;
xterm_dpy_retry_count = 5; // Try reconnecting five times
x11_window = 0;
x11_display = NULL;
xterm_Shell = (Widget)0;
@@ -1704,9 +1704,9 @@ x_IOerror_handler(Display *dpy UNUSED)
static void
may_restore_clipboard(void)
{
if (xterm_dpy_was_reset)
if (xterm_dpy_retry_count > 0)
{
xterm_dpy_was_reset = FALSE;
--xterm_dpy_retry_count;
# ifndef LESSTIF_VERSION
/* This has been reported to avoid Vim getting stuck. */
@@ -5553,7 +5553,7 @@ mch_job_start(char **argv, job_T *job, jobopt_T *options, int is_terminal)
{
typval_T *item = &dict_lookup(hi)->di_tv;
vim_setenv((char_u*)hi->hi_key, get_tv_string(item));
vim_setenv((char_u*)hi->hi_key, tv_get_string(item));
--todo;
}
}
@@ -7494,6 +7494,8 @@ setup_term_clip(void)
{
xterm_dpy = XtOpenDisplay(app_context, xterm_display,
"vim_xterm", "Vim_xterm", NULL, 0, &z, &strp);
if (xterm_dpy != NULL)
xterm_dpy_retry_count = 0;
#if defined(HAVE_SETJMP_H)
mch_endjmp();
#endif