mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-17 00:38:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4639 from brcolow/vim-7.4.1347

Browse Source 
vim-patch: 7.4.1347
This commit is contained in:
Justin M. Keyes
2016-05-10 01:22:25 -04:00
parent 9fe0302385 9cf91a8691
commit c7f02f4f8d
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/nvim/message.c
View File

@@ -467,22 +467,23 @@ int emsg(char_u *s)
{ {
int attr; int attr;
char_u *p; char_u *p;
int ignore = FALSE; int ignore = false;
int severe; int severe;
/* Skip this if not giving error messages at the moment. */ // Skip this if not giving error messages at the moment.
if (emsg_not_now()) if (emsg_not_now()) {
return TRUE; return true;
}
called_emsg = TRUE; called_emsg = true;
ex_exitval = 1; if (emsg_silent == 0) {
ex_exitval = 1;
}
/* // If "emsg_severe" is TRUE: When an error exception is to be thrown,
* If "emsg_severe" is TRUE: When an error exception is to be thrown, // prefer this message over previous messages for the same command.
* prefer this message over previous messages for the same command.
*/
severe = emsg_severe; severe = emsg_severe;
emsg_severe = FALSE; emsg_severe = false;
if (!emsg_off || vim_strchr(p_debug, 't') != NULL) { if (!emsg_off || vim_strchr(p_debug, 't') != NULL) {
/* /*

2
src/nvim/version.c
View File

@@ -331,7 +331,7 @@ static int included_patches[] = {
// 1350 NA // 1350 NA
// 1349 NA // 1349 NA
// 1348 NA // 1348 NA
// 1347, 1347,
1346, 1346,
// 1345 NA // 1345 NA
// 1344 NA // 1344 NA