diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-09-26 16:39:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 16:39:56 -0400 |
| commit | 5c25d65f4507a3967aa4605dbcd44905be2c0eea (patch) | |
| tree | 96a9244cac797953e951b26b759f3d3d095e73e0 | |
| parent | b3905c44d1ab42bddb7fb6f782051c5291804b7f (diff) | |
| parent | 3ab6a519fca63d1fcb5eeb98437697a7abaca7b0 (diff) | |
| download | rneovim-5c25d65f4507a3967aa4605dbcd44905be2c0eea.tar.gz rneovim-5c25d65f4507a3967aa4605dbcd44905be2c0eea.tar.bz2 rneovim-5c25d65f4507a3967aa4605dbcd44905be2c0eea.zip | |
Merge pull request #7309 from ckelsel/vim-8.0.0328
vim-patch:8.0.0328
| -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 a060b4a74f..1ef7ce3b53 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, |