aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-04 23:07:33 -04:00
Code

patch 8.0.0556: getting window position fails if GUI and term possible

Browse Source 
Problem:    Getting the window position fails if both the GUI and term
            code is built in.
Solution:   Return after getting the GUI window position. (Kazunobu Kuriyama)
This commit is contained in:
Bram Moolenaar 2017-04-09 15:03:15 +02:00
parent d2381a2cad
commit 7860bac57b
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/evalfunc.c
View File

@ -5302,6 +5302,7 @@ f_getwinposx(typval_T *argvars UNUSED, typval_T *rettv)
if (gui_mch_get_winpos(&x, &y) == OK) if (gui_mch_get_winpos(&x, &y) == OK)
rettv->vval.v_number = x; rettv->vval.v_number = x;
return;
} }
#endif #endif
#if defined(HAVE_TGETENT) && defined(FEAT_TERMRESPONSE) #if defined(HAVE_TGETENT) && defined(FEAT_TERMRESPONSE)
@ -5328,6 +5329,7 @@ f_getwinposy(typval_T *argvars UNUSED, typval_T *rettv)
if (gui_mch_get_winpos(&x, &y) == OK) if (gui_mch_get_winpos(&x, &y) == OK)
rettv->vval.v_number = y; rettv->vval.v_number = y;
return;
} }
#endif #endif
#if defined(HAVE_TGETENT) && defined(FEAT_TERMRESPONSE) #if defined(HAVE_TGETENT) && defined(FEAT_TERMRESPONSE)
@ -7715,6 +7717,7 @@ static int mkdir_recurse(char_u *dir, int prot);
/* /*
* Create the directory in which "dir" is located, and higher levels when * Create the directory in which "dir" is located, and higher levels when
* needed. * needed.
* Return OK or FAIL.
*/ */
static int static int
mkdir_recurse(char_u *dir, int prot) mkdir_recurse(char_u *dir, int prot)

2
src/version.c
View File

@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
556,
/**/ /**/
555, 555,
/**/ /**/