# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1456180207 -3600
# Node ID 78f2e8c079737add6ae43e788a6131a4e85882e3
# Parent  22d94e059fc7525119abfaf9831d7d050bc5f609
commit https://github.com/vim/vim/commit/1daae446e58fd90f98c51ff3af8f54bfa5197751
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Feb 22 23:25:25 2016 +0100

    patch 7.4.1396
    Problem:    Compiler warnings for conversions.
    Solution:   Add type cast.

diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -3087,8 +3087,8 @@ source_pack_plugin(char_u *fname, void *
     if (strstr((char *)p_rtp, (char *)fname) == NULL)
     {
 	/* directory not in 'runtimepath', add it */
-	oldlen = STRLEN(p_rtp);
-	addlen = STRLEN(fname);
+	oldlen = (int)STRLEN(p_rtp);
+	addlen = (int)STRLEN(fname);
 	new_rtp = alloc(oldlen + addlen + 2);
 	if (new_rtp == NULL)
 	{
@@ -3130,7 +3130,7 @@ ex_loadplugin(exarg_T *eap)
     int		len;
     char	*pat;
 
-    len = STRLEN(pattern) + STRLEN(eap->arg);
+    len = (int)STRLEN(pattern) + (int)STRLEN(eap->arg);
     pat = (char *)alloc(len);
     if (pat == NULL)
 	return;
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1396,
+/**/
     1395,
 /**/
     1394,