diff options
author | ckelsel <ckelsel@hotmail.com> | 2017-09-24 09:29:08 +0800 |
---|---|---|
committer | ckelsel <ckelsel@hotmail.com> | 2017-09-24 09:41:09 +0800 |
commit | 3ab6a519fca63d1fcb5eeb98437697a7abaca7b0 (patch) | |
tree | 04ba75a480ea6ed2266b85ff91657e1a001a022d /src | |
parent | 4bb0e95abbf0a61d383d5261019a2667706c9d39 (diff) | |
download | rneovim-3ab6a519fca63d1fcb5eeb98437697a7abaca7b0.tar.gz rneovim-3ab6a519fca63d1fcb5eeb98437697a7abaca7b0.tar.bz2 rneovim-3ab6a519fca63d1fcb5eeb98437697a7abaca7b0.zip |
vim-patch:8.0.0328
Problem: The "zero count" error doesn't have a number. (Hirohito Higashi)
Solution: Give it a number and be more specific about the error.
https://github.com/vim/vim/commit/23a5558cfd860401aa694f0302d621887440f031
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/globals.h | 5 | ||||
-rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/globals.h b/src/nvim/globals.h index 2ee72cdb6a..300e506854 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -1146,8 +1146,9 @@ EXTERN char_u e_winheight[] INIT(= N_( EXTERN char_u e_winwidth[] INIT(= N_( "E592: 'winwidth' cannot be smaller than 'winminwidth'")); EXTERN char_u e_write[] INIT(= N_("E80: Error while writing")); -EXTERN char_u e_zerocount[] INIT(= N_("Zero count")); -EXTERN char_u e_usingsid[] INIT(= N_("E81: Using <SID> not in a script context")); +EXTERN char_u e_zerocount[] INIT(= N_("E939: Positive count required")); +EXTERN char_u e_usingsid[] INIT(= N_( + "E81: Using <SID> not in a script context")); EXTERN char_u e_intern2[] INIT(= N_("E685: Internal error: %s")); EXTERN char_u e_maxmempat[] INIT(= N_( "E363: pattern uses more memory than 'maxmempattern'")); diff --git a/src/nvim/version.c b/src/nvim/version.c index d4f9c0232f..09a62a3b0e 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -624,7 +624,7 @@ static const int included_patches[] = { 331, // 330, // 329, - // 328, + 328, 327, 326, 325, |