From 669cac0a805333e69b9e1176425083914eada659 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 25 Feb 2016 15:25:03 +0100
Subject: [PATCH] =?UTF-8?q?patch=207.4.1416=20Problem:=20=20=20=20Using=20?=
 =?UTF-8?q?"u=5Fchar"=20intead=20of=20"char=5Fu",=20which=20doesn't=20work?=
 =?UTF-8?q?=20everywhere.=20=20=20=20=20=20=20=20=20=20=20=20=20(J=C3=B6rg?=
 =?UTF-8?q?=20Plate)=20Solution:=20=20=20Use=20"char=5Fu"=20always.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/integration.c | 2 +-
 src/macros.h      | 2 +-
 src/version.c     | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/integration.c b/src/integration.c
index 5879a0b229..87380c8e1d 100644
--- a/src/integration.c
+++ b/src/integration.c
@@ -805,7 +805,7 @@ widgetIsIconified(
 	if (XtWindow(w) != 0) {			/* only check if window exists! */
 		XGetWindowProperty(XtDisplay(w), XtWindow(w), wm_state, 0L, 2L,
 		    False, AnyPropertyType, &act_type, &act_fmt, &nitems_ret,
-		    &bytes_after, (u_char **) &property);
+		    &bytes_after, (char_u **) &property);
 		if (nitems_ret == 2 && property[0] == IconicState) {
 			return True;
 		}
diff --git a/src/macros.h b/src/macros.h
index ffc29f062e..6e2c94ff15 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -119,7 +119,7 @@
 #endif
 
 /* Returns empty string if it is NULL. */
-#define EMPTY_IF_NULL(x) ((x) ? (x) : (u_char *)"")
+#define EMPTY_IF_NULL(x) ((x) ? (x) : (char_u *)"")
 
 #ifdef FEAT_LANGMAP
 /*
diff --git a/src/version.c b/src/version.c
index 12ce7cbf59..f08bf1b2aa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1416,
 /**/
     1415,
 /**/