Mercurial > vim
diff src/option.c @ 12946:eae40b455a72 v8.0.1349
patch 8.0.1349: options test fails when using Motif or GTK GUI
commit https://github.com/vim/vim/commit/17471e84a72b5137a6010a98c4adb780237750db
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Nov 26 23:47:18 2017 +0100
patch 8.0.1349: options test fails when using Motif or GTK GUI
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.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 27 Nov 2017 00:00:05 +0100 |
| parents | 85a601f985ab |
| children | 8566eaa08788 |
line wrap: on
line diff
--- 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)