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

Merge pull request #4787 from brcolow/vim-7.4.1050

Browse Source 
vim-patch:7.4.1050
This commit is contained in:
Justin M. Keyes
2016-05-22 12:24:30 -04:00
parent c3ebfff18b 6e68cc570c
commit d8d159c123
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
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 - STRLEN(IObuff),
_("(+%" 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,19 +5386,17 @@ 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); 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); 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); 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);
}
} }
} }

2
src/nvim/version.c
View File

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