Merge pull request #7309 from ckelsel/vim-8.0.0328

vim-patch:8.0.0328
This commit is contained in:
James McCoy
2017-09-26 16:39:56 -04:00
committed by GitHub
2 changed files with 4 additions and 3 deletions

View File

@@ -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'"));

View File

@@ -624,7 +624,7 @@ static const int included_patches[] = {
331,
// 330,
// 329,
// 328,
328,
327,
326,
325,