diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-10 01:22:25 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-10 01:22:25 -0400 |
| commit | c7f02f4f8d6ff9bb5b618e3e3030759ff54da003 (patch) | |
| tree | d97164e5e85998330258d3dcb3cf44eca6003f6e /src | |
| parent | 9fe0302385fadd91e5ddd8b0e25d3054ce7afbc4 (diff) | |
| parent | 9cf91a8691871c34078a387c09452812e6b2098f (diff) | |
| download | rneovim-c7f02f4f8d6ff9bb5b618e3e3030759ff54da003.tar.gz rneovim-c7f02f4f8d6ff9bb5b618e3e3030759ff54da003.tar.bz2 rneovim-c7f02f4f8d6ff9bb5b618e3e3030759ff54da003.zip | |
Merge pull request #4639 from brcolow/vim-7.4.1347
vim-patch: 7.4.1347
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/message.c | 23 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c index f60b128712..265f8c00c0 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -467,22 +467,23 @@ int emsg(char_u *s) { int attr; char_u *p; - int ignore = FALSE; + int ignore = false; int severe; - /* Skip this if not giving error messages at the moment. */ - if (emsg_not_now()) - return TRUE; + // Skip this if not giving error messages at the moment. + if (emsg_not_now()) { + return true; + } - called_emsg = TRUE; - ex_exitval = 1; + called_emsg = true; + if (emsg_silent == 0) { + ex_exitval = 1; + } - /* - * If "emsg_severe" is TRUE: When an error exception is to be thrown, - * prefer this message over previous messages for the same command. - */ + // If "emsg_severe" is TRUE: When an error exception is to be thrown, + // prefer this message over previous messages for the same command. severe = emsg_severe; - emsg_severe = FALSE; + emsg_severe = false; if (!emsg_off || vim_strchr(p_debug, 't') != NULL) { /* diff --git a/src/nvim/version.c b/src/nvim/version.c index b2dbfe87c8..51db539acd 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -331,7 +331,7 @@ static int included_patches[] = { // 1350 NA // 1349 NA // 1348 NA - // 1347, + 1347, 1346, // 1345 NA // 1344 NA |