diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-22 12:24:30 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-22 12:24:30 -0400 |
| commit | d8d159c123336ed0c2eac36fcca66c45633d0370 (patch) | |
| tree | 017c1787d72d36f8b47f60a5f3852738e10e29cc | |
| parent | c3ebfff18b334d5e49acc1ec09f123377348f518 (diff) | |
| parent | 6e68cc570c4f6e84e61b5b1f57f9626c0f2b759d (diff) | |
| download | rneovim-d8d159c123336ed0c2eac36fcca66c45633d0370.tar.gz rneovim-d8d159c123336ed0c2eac36fcca66c45633d0370.tar.bz2 rneovim-d8d159c123336ed0c2eac36fcca66c45633d0370.zip | |
Merge pull request #4787 from brcolow/vim-7.4.1050
vim-patch:7.4.1050
| -rw-r--r-- | src/nvim/ops.c | 19 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 9 insertions, 12 deletions
diff --git a/src/nvim/ops.c b/src/nvim/ops.c index eda963ff77..adfd0424f0 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -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(); if (bom_count > 0) { 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) { p = p_shm; @@ -5387,20 +5386,18 @@ void cursor_pos_info(dict_T *dict) } 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, "chars", char_count, NULL); dict_add_nr_str(dict, "bytes", byte_count + bom_count, NULL); - if (l_VIsual_active) { - dict_add_nr_str(dict, "visual_bytes", byte_count_cursor, NULL); - dict_add_nr_str(dict, "visual_chars", char_count_cursor, NULL); - dict_add_nr_str(dict, "visual_words", word_count_cursor, NULL); - } else { - dict_add_nr_str(dict, "cursor_bytes", byte_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); + dict_add_nr_str(dict, l_VIsual_active ? "visual_bytes" : "cursor_bytes", + byte_count_cursor, NULL); + dict_add_nr_str(dict, l_VIsual_active ? "visual_chars" : "cursor_chars", + char_count_cursor, NULL); + dict_add_nr_str(dict, l_VIsual_active ? "visual_words" : "cursor_words", + word_count_cursor, NULL); } - } } /// Check if the default register (used in an unnamed paste) should be a diff --git a/src/nvim/version.c b/src/nvim/version.c index b713285c61..3134b10108 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -634,7 +634,7 @@ static int included_patches[] = { // 1053, 1052, // 1051, - // 1050, + 1050, 1049, 1048, 1047, |