Skip to content

Commit 7860bac

Browse files
committed
patch 8.0.0556: getting window position fails if GUI and term possible
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)
1 parent d2381a2 commit 7860bac

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

src/evalfunc.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5302,6 +5302,7 @@ f_getwinposx(typval_T *argvars UNUSED, typval_T *rettv)
53025302

53035303
if (gui_mch_get_winpos(&x, &y) == OK)
53045304
rettv->vval.v_number = x;
5305+
return;
53055306
}
53065307
#endif
53075308
#if defined(HAVE_TGETENT) && defined(FEAT_TERMRESPONSE)
@@ -5328,6 +5329,7 @@ f_getwinposy(typval_T *argvars UNUSED, typval_T *rettv)
53285329

53295330
if (gui_mch_get_winpos(&x, &y) == OK)
53305331
rettv->vval.v_number = y;
5332+
return;
53315333
}
53325334
#endif
53335335
#if defined(HAVE_TGETENT) && defined(FEAT_TERMRESPONSE)
@@ -7715,6 +7717,7 @@ static int mkdir_recurse(char_u *dir, int prot);
77157717
/*
77167718
* Create the directory in which "dir" is located, and higher levels when
77177719
* needed.
7720+
* Return OK or FAIL.
77187721
*/
77197722
static int
77207723
mkdir_recurse(char_u *dir, int prot)

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
556,
767769
/**/
768770
555,
769771
/**/

0 commit comments

Comments
 (0)