mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-01 07:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.1050

Browse Source 
Problem:    Warning for unused var with tiny features. (Tony Mechelynck)
Solution:   Add #ifdef.  Use vim_snprintf().  Reduce number of statements.

c71982b239
This commit is contained in:
Michael Ennen
2016-05-19 14:45:06 -07:00
parent 7d11cc6912
commit 2ebf365db9
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/nvim/ops.c
View File

@@ -5372,11 +5372,10 @@ void cursor_pos_info(dict_T *dict)
} }
} }
// Don't shorten this message, the user asked for it.
bom_count = bomb_size(); bom_count = bomb_size();
if (bom_count > 0) { if (bom_count > 0) {
vim_snprintf((char *)IObuff + STRLEN(IObuff), IOSIZE - STRLEN(IObuff), vim_snprintf((char *)IObuff + STRLEN(IObuff), IOSIZE,
_("(+%" PRId64 " for BOM)"), (int64_t)byte_count); _("(+%" PRId64 " for BOM)"), (int64_t)bom_count);
} }
if (dict == NULL) { if (dict == NULL) {
p = p_shm; p = p_shm;
@@ -5387,20 +5386,18 @@ void cursor_pos_info(dict_T *dict)
} }
if (dict != NULL) { if (dict != NULL) {
// Don't shorten this message, the user asked for it.
dict_add_nr_str(dict, "words", word_count, NULL); dict_add_nr_str(dict, "words", word_count, NULL);
dict_add_nr_str(dict, "chars", char_count, NULL); dict_add_nr_str(dict, "chars", char_count, NULL);
dict_add_nr_str(dict, "bytes", byte_count + bom_count, NULL); dict_add_nr_str(dict, "bytes", byte_count + bom_count, NULL);
if (l_VIsual_active) { dict_add_nr_str(dict, l_VIsual_active ? "visual_bytes" : "cursor_bytes",
dict_add_nr_str(dict, "visual_bytes", byte_count_cursor, NULL); (long)byte_count_cursor, NULL);
dict_add_nr_str(dict, "visual_chars", char_count_cursor, NULL); dict_add_nr_str(dict, l_VIsual_active ? "visual_chars" : "cursor_chars",
dict_add_nr_str(dict, "visual_words", word_count_cursor, NULL); (long)char_count_cursor, NULL);
} else { dict_add_nr_str(dict, l_VIsual_active ? "visual_words" : "cursor_words",
dict_add_nr_str(dict, "cursor_bytes", byte_count_cursor, NULL); (long)word_count_cursor, NULL);
dict_add_nr_str(dict, "cursor_chars", char_count_cursor, NULL);
dict_add_nr_str(dict, "cursor_words", word_count_cursor, NULL);
} }
}
} }
/// Check if the default register (used in an unnamed paste) should be a /// Check if the default register (used in an unnamed paste) should be a

2
src/nvim/version.c
View File

@@ -633,7 +633,7 @@ static int included_patches[] = {
// 1053, // 1053,
1052, 1052,
// 1051, // 1051,
// 1050, 1050,
1049, 1049,
1048, 1048,
1047, 1047,