mirror of
https://github.com/neovim/neovim.git
synced 2025-09-12 14:28:18 +00:00
[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.06e6377009
* vim-patch:8.1.0749: error message contains garbage Problem: Error message contains garbage. (Dominique Pelle) Solution: Use correct pointer to failed expression.6acc79f5d4
This commit is contained in:

committed by
Justin M. Keyes

parent
f55c1e4233
commit
7f66fdb54d
@@ -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;
|
||||
|
Reference in New Issue
Block a user