diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-27 20:47:18 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-27 20:47:18 +0100 |
| commit | 4a1314cb9c1847dc32ceeb3eebeae123ef10b16e (patch) | |
| tree | 708b2fa8d77638787bff7591cfd70ab560df2cd0 | |
| parent | 0d6f835683bede8bfa171c2518dce10832eb8226 (diff) | |
patch 7.4.1186v7.4.1186
Problem: Error messages for security context are hard to translate.
Solution: Use one string with %s. (Ken Takata)
| -rw-r--r-- | src/os_unix.c | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 9 deletions
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 @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1186, +/**/ 1185, /**/ 1184, |