aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/mbyte.c7
-rw-r--r--src/nvim/version.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index e05b3f3a37..e4ed46208b 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, ARRAY_SIZE(emoji), c)) {
+ if (p_emoji && intable(emoji_tab, ARRAY_SIZE(emoji_tab), c)) {
return 2;
}
}
@@ -1715,6 +1715,11 @@ int utf_class(int c)
return (int)classes[mid].class;
}
+ // emoji
+ if (intable(emoji_tab, ARRAY_SIZE(emoji_tab), c)) {
+ return 3;
+ }
+
/* most other characters are "word" characters */
return 2;
}
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 0106185d13..43aaa6b1ed 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -823,7 +823,7 @@ static int included_patches[] = {
// 1623 NA
// 1622 NA
// 1621 NA
- // 1620,
+ 1620,
// 1619,
// 1618 NA
// 1617 NA