diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-09-27 19:21:40 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-09-27 19:21:40 +0800 |
| commit | dde62900c8cfed967bd54218c8eb0790954f8c14 (patch) | |
| tree | c3bc82d0edcc3582578922bd0d13233ab751b576 /src/nvim/globals.h | |
| parent | 3a1c33a6c3ad5074bfc442507282a438726f1b58 (diff) | |
| parent | 542ed5f5d31647bfec6d3119f4e2993544530c35 (diff) | |
| download | rneovim-dde62900c8cfed967bd54218c8eb0790954f8c14.tar.gz rneovim-dde62900c8cfed967bd54218c8eb0790954f8c14.tar.bz2 rneovim-dde62900c8cfed967bd54218c8eb0790954f8c14.zip | |
Merge branch 'master' of https://github.com/neovim/neovim into vim-8.0.0101
fix Conflicts
Diffstat (limited to 'src/nvim/globals.h')
| -rw-r--r-- | src/nvim/globals.h | 5 |
1 files changed, 3 insertions, 2 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'")); |