From 4a1314cb9c1847dc32ceeb3eebeae123ef10b16e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 27 Jan 2016 20:47:18 +0100 Subject: patch 7.4.1186 Problem: Error messages for security context are hard to translate. Solution: Use one string with %s. (Ken Takata) --- src/os_unix.c | 18 +++++++++--------- src/version.c | 2 ++ 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/os_unix.c b/src/os_unix.c index 0a73c88941..8d19004bfe 100644 --- 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 429cbe7bb2..487dfd9c49 100644 --- 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, /**/ -- cgit v1.2.3