# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1453924805 -3600
# Node ID 4e09a38129a35060809ce92f3115cdef7dffef7f
# Parent  3f2d25636986d9c140deac514483551deb26010d
commit https://github.com/vim/vim/commit/4a1314cb9c1847dc32ceeb3eebeae123ef10b16e
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Jan 27 20:47:18 2016 +0100

    patch 7.4.1186
    Problem:    Error messages for security context are hard to translate.
    Solution:   Use one string with %s. (Ken Takata)

diff --git a/src/os_unix.c b/src/os_unix.c
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2822,10 +2822,10 @@ mch_copy_sec(from_file, to_file)
 	    ret = setxattr((char*)to_file, name, buffer, (size_t)size, 0);
 	    if (ret < 0)
 	    {
-		MSG_PUTS(_("Could not set security context "));
-		MSG_PUTS(name);
-		MSG_PUTS(_(" for "));
-		msg_outtrans(to_file);
+		vim_snprintf((char *)IObuff, IOSIZE,
+			_("Could not set security context %s for %s"),
+			name, to_file);
+		msg_outtrans(IObuff);
 		msg_putchar('\n');
 	    }
 	}
@@ -2842,11 +2842,11 @@ mch_copy_sec(from_file, to_file)
 		case ERANGE:
 		default:
 		    /* no enough size OR unexpected error */
-		    MSG_PUTS(_("Could not get security context "));
-		    MSG_PUTS(name);
-		    MSG_PUTS(_(" for "));
-		    msg_outtrans(from_file);
-		    MSG_PUTS(_(". Removing it!\n"));
+		     vim_snprintf((char *)IObuff, IOSIZE,
+			    _("Could not get security context %s for %s. Removing it!"),
+			    name, from_file);
+		    msg_puts(IObuff);
+		    msg_putchar('\n');
 		    /* FALLTHROUGH to remove the attribute */
 
 		case ENODATA:
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1186,
+/**/
     1185,
 /**/
     1184,