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)

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 08f0a41af8d70960587b2fb350074eda32469402..45c43f68501dfa3367801431ee8bf0d1683ceab4 100644 (file)
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -5302,6 +5302,7 @@ f_getwinposx(typval_T *argvars UNUSED, typval_T *rettv)
 
        if (gui_mch_get_winpos(&x, &y) == OK)
            rettv->vval.v_number = x;
+       return;
     }
 #endif
 #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)
            rettv->vval.v_number = y;
+       return;
     }
 #endif
 #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
  * needed.
+ * Return OK or FAIL.
  */
     static int
 mkdir_recurse(char_u *dir, int prot)

diff --git a/src/version.c b/src/version.c
index 7cf764443767f6d7d1963fba2eb94b4749a56c3c..efb2ef3e95f7015e98fce0ec0d9120b050a13429 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    556,
 /**/
     555,
 /**/