diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-07-20 04:48:45 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-07-20 10:48:45 +0200 |
| commit | 7f66fdb54d6702d23c99e7aa81b6caec7c5fda7c (patch) | |
| tree | cd45ec11da67def4f9ca1f195a92e441e2e933b2 | |
| parent | f55c1e4233a44a7453a61eba0eed632d3c1f97cb (diff) | |
| download | rneovim-7f66fdb54d6702d23c99e7aa81b6caec7c5fda7c.tar.gz rneovim-7f66fdb54d6702d23c99e7aa81b6caec7c5fda7c.tar.bz2 rneovim-7f66fdb54d6702d23c99e7aa81b6caec7c5fda7c.zip | |
[RFC]vim-patch:8.1.{749,1715} #10545
* vim-patch:8.1.1715: emoji characters are seen as word characters for spelling
Problem: Emoji characters are seen as word characters for spelling. (Gautam
Iyer)
Solution: Exclude class 3 from word characters.
https://github.com/vim/vim/commit/06e6377009c5763639310fa3bf892dec27a63334
* vim-patch:8.1.0749: error message contains garbage
Problem: Error message contains garbage. (Dominique Pelle)
Solution: Use correct pointer to failed expression.
https://github.com/vim/vim/commit/6acc79f5d4b9d5b02f4ab21ec885e68acc13a2e2
| -rw-r--r-- | src/nvim/eval.c | 3 | ||||
| -rw-r--r-- | src/nvim/spell.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index eb2a6ff32a..6774000ae4 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -961,6 +961,7 @@ eval_to_bool( static int eval1_emsg(char_u **arg, typval_T *rettv, bool evaluate) FUNC_ATTR_NONNULL_ARG(1, 2) { + const char_u *const start = *arg; const int did_emsg_before = did_emsg; const int called_emsg_before = called_emsg; @@ -973,7 +974,7 @@ static int eval1_emsg(char_u **arg, typval_T *rettv, bool evaluate) if (!aborting() && did_emsg == did_emsg_before && called_emsg == called_emsg_before) { - emsgf(_(e_invexpr2), arg); + emsgf(_(e_invexpr2), start); } } return ret; diff --git a/src/nvim/spell.c b/src/nvim/spell.c index 17306744ad..b5885e65f3 100644 --- a/src/nvim/spell.c +++ b/src/nvim/spell.c @@ -2616,7 +2616,7 @@ static bool spell_mb_isword_class(int cl, win_T *wp) if (wp->w_s->b_cjk) // East Asian characters are not considered word characters. return cl == 2 || cl == 0x2800; - return cl >= 2 && cl != 0x2070 && cl != 0x2080; + return cl >= 2 && cl != 0x2070 && cl != 0x2080 && cl != 3; } // Returns true if "p" points to a word character. |