From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 9 Apr 2017 13:03:15 +0000 (+0200)
Subject: patch 8.0.0556: getting window position fails if GUI and term possible
X-Git-Tag: v8.0.0556
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7860bac57baeda408d5ef84f3334b0e52cc690bd;p=thirdparty%2Fvim.git

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 08f0a41af8..45c43f6850 100644
--- 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 7cf7644437..efb2ef3e95 100644
--- 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,
 /**/