diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-04-21 00:33:12 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-04-21 00:33:12 +0300 |
| commit | d463c9e03a79e981faaaa985b1160c292d08e172 (patch) | |
| tree | 8ebfb9bc003f76a6be2d84035c52c6fdd24afbb5 /src/nvim/hardcopy.c | |
| parent | c289986c89dd0189ed8ab709bf2eb822c493542a (diff) | |
| parent | 19646a2985e54dfc561a90a70054522afc052a45 (diff) | |
| download | rneovim-d463c9e03a79e981faaaa985b1160c292d08e172.tar.gz rneovim-d463c9e03a79e981faaaa985b1160c292d08e172.tar.bz2 rneovim-d463c9e03a79e981faaaa985b1160c292d08e172.zip | |
Merge branch 'master' into lazier-arg_errmsg-gettext
Diffstat (limited to 'src/nvim/hardcopy.c')
| -rw-r--r-- | src/nvim/hardcopy.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c index 4cb05ffc12..abc4773d84 100644 --- a/src/nvim/hardcopy.c +++ b/src/nvim/hardcopy.c @@ -1,3 +1,6 @@ +// This is an open source non-commercial project. Dear PVS-Studio, please check +// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com + /* * hardcopy.c: printing to paper */ @@ -2576,13 +2579,12 @@ int mch_print_begin(prt_settings_T *psettings) prt_conv.vc_type = CONV_NONE; if (!(enc_canon_props(p_enc) & enc_canon_props(p_encoding) & ENC_8BIT)) { - /* Set up encoding conversion if required */ - if (FAIL == convert_setup(&prt_conv, p_enc, p_encoding)) { - EMSG2(_("E620: Unable to convert to print encoding \"%s\""), - p_encoding); - return FALSE; + // Set up encoding conversion if required + if (convert_setup(&prt_conv, p_enc, p_encoding) == FAIL) { + emsgf(_("E620: Unable to convert to print encoding \"%s\""), + p_encoding); + return false; } - prt_do_conv = TRUE; } prt_do_conv = prt_conv.vc_type != CONV_NONE; |