diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-11-26 23:47:18 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-11-26 23:47:18 +0100 |
| commit | 17471e84a72b5137a6010a98c4adb780237750db (patch) | |
| tree | 315022c44942fd494b62c2053da381f1cc6e3acb /src/option.c | |
| parent | c8c75796a60e89210cc470f1b3864546fd4f319a (diff) | |
| download | vim-git-17471e84a72b5137a6010a98c4adb780237750db.tar.gz | |
patch 8.0.1349: options test fails when using Motif or GTK GUIv8.0.1349
Problem: Options test fails when using Motif or GTK GUI.
Solution: Use "fixed" instead of "fixedsys" for Unix. Don't try "xxx" for
guifonteset. Don't set 'termencoding' to anything but "utf-8" for
GTK. Give an error if 'termencoding' can't be converted.
Diffstat (limited to 'src/option.c')
| -rw-r--r-- | src/option.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/option.c b/src/option.c index a86760860..c97056bde 100644 --- a/src/option.c +++ b/src/option.c @@ -6369,8 +6369,13 @@ did_set_string_option( * display output conversion. */ if (((varp == &p_enc && *p_tenc != NUL) || varp == &p_tenc)) { - convert_setup(&input_conv, p_tenc, p_enc); - convert_setup(&output_conv, p_enc, p_tenc); + if (convert_setup(&input_conv, p_tenc, p_enc) == FAIL + || convert_setup(&output_conv, p_enc, p_tenc) == FAIL) + { + EMSG3(_("E950: Cannot convert between %s and %s"), + p_tenc, p_enc); + errmsg = e_invarg; + } } # if defined(WIN3264) && defined(FEAT_MBYTE) |