# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1491743703 -7200
# Node ID 98abcd1227dce0564324591974b5c3eae8c660fd
# Parent  91a2bb32dfda138171307bb93c47e9ee18be58b5
patch 8.0.0556: getting window position fails if GUI and term possible

commit https://github.com/vim/vim/commit/7860bac57baeda408d5ef84f3334b0e52cc690bd
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Apr 9 15:03:15 2017 +0200

    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
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -5302,6 +5302,7 @@ f_getwinposx(typval_T *argvars UNUSED, t
 
 	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, t
 
 	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, in
 /*
  * 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
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    556,
+/**/
     555,
 /**/
     554,