thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1349: options test fails when using Motif or GTK GUI

Browse Source 
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.
This commit is contained in:
Bram Moolenaar
2017-11-26 23:47:18 +01:00
parent c8c75796a6
commit 17471e84a7
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/option.c
View File

@@ -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)