diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-09-22 00:43:19 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2016-09-24 14:03:22 -0400 |
| commit | 1144cc6d9edd8d59b6f24e4d8f1df395342c2619 (patch) | |
| tree | d089014953f2fcc3f21cc79c5b149e167129b4b4 /src | |
| parent | 45598d2e5e2b56e24e4d5abe4f28f259e3def572 (diff) | |
| download | rneovim-1144cc6d9edd8d59b6f24e4d8f1df395342c2619.tar.gz rneovim-1144cc6d9edd8d59b6f24e4d8f1df395342c2619.tar.bz2 rneovim-1144cc6d9edd8d59b6f24e4d8f1df395342c2619.zip | |
vim-patch:7.4.1629
Problem: Handling emoji characters as full width has problems with
backwards compatibility.
Solution: Remove ambiguous and double width characters from the emoji table.
Use a separate table for the character class.
(partly by Yashuhiro Matsumoto)
https://github.com/vim/vim/commit/b86f10ee10bdf932df02bdaf601dffa671518a47
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/mbyte.c | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index e4ed46208b..2978171051 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -949,7 +949,7 @@ int utf_char2cells(int c) if (intable(doublewidth, ARRAY_SIZE(doublewidth), c)) return 2; #endif - if (p_emoji && intable(emoji_tab, ARRAY_SIZE(emoji_tab), c)) { + if (p_emoji && intable(emoji_width, ARRAY_SIZE(emoji_width), c)) { return 2; } } @@ -1716,7 +1716,7 @@ int utf_class(int c) } // emoji - if (intable(emoji_tab, ARRAY_SIZE(emoji_tab), c)) { + if (intable(emoji_all, ARRAY_SIZE(emoji_all), c)) { return 3; } diff --git a/src/nvim/version.c b/src/nvim/version.c index 43aaa6b1ed..02ee2113b9 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -814,7 +814,7 @@ static int included_patches[] = { // 1632 NA // 1631 NA // 1630, - // 1629, + 1629, // 1628 NA // 1627 NA // 1626 NA |