aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.1186

Browse Source 
Problem:    Error messages for security context are hard to translate.
Solution:   Use one string with %s. (Ken Takata)
This commit is contained in:
Bram Moolenaar 2016-01-27 20:47:18 +01:00
parent 0d6f835683
commit 4a1314cb9c
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/os_unix.c
View File

@ -2822,10 +2822,10 @@ mch_copy_sec(from_file, to_file)
ret = setxattr((char*)to_file, name, buffer, (size_t)size, 0); ret = setxattr((char*)to_file, name, buffer, (size_t)size, 0);
if (ret < 0) if (ret < 0)
{ {
MSG_PUTS(_("Could not set security context ")); vim_snprintf((char *)IObuff, IOSIZE,
MSG_PUTS(name); _("Could not set security context %s for %s"),
MSG_PUTS(_(" for ")); name, to_file);
msg_outtrans(to_file); msg_outtrans(IObuff);
msg_putchar('\n'); msg_putchar('\n');
} }
} }
@ -2842,11 +2842,11 @@ mch_copy_sec(from_file, to_file)
case ERANGE: case ERANGE:
default: default:
/* no enough size OR unexpected error */ /* no enough size OR unexpected error */
MSG_PUTS(_("Could not get security context ")); vim_snprintf((char *)IObuff, IOSIZE,
MSG_PUTS(name); _("Could not get security context %s for %s. Removing it!"),
MSG_PUTS(_(" for ")); name, from_file);
msg_outtrans(from_file); msg_puts(IObuff);
MSG_PUTS(_(". Removing it!\n")); msg_putchar('\n');
/* FALLTHROUGH to remove the attribute */ /* FALLTHROUGH to remove the attribute */
case ENODATA: case ENODATA:

2
src/version.c
View File

@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1186,
/**/ /**/
1185, 1185,
/**/ /**/