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
index 0a73c8894188f021df0a988073405032f15b4f42..8d19004bfeb2bf52f039412bcde95f773bfb49a1 100644 (file)
--- 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
index 429cbe7bb27501eede3ea852550842c21e36dace..487dfd9c495d572a6aad89ffa3297c8faaf28caf 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1186,
 /**/
     1185,
 /**/