Mercurial > vim

comparison src/option.c @ 12946:eae40b455a72 v8.0.1349

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
12945:ffe901f0ba65 12946:eae40b455a72
6367 /* When 'termencoding' is not empty and 'encoding' changes or when 6367 /* When 'termencoding' is not empty and 'encoding' changes or when
6368 * 'termencoding' changes, need to setup for keyboard input and 6368 * 'termencoding' changes, need to setup for keyboard input and
6369 * display output conversion. */ 6369 * display output conversion. */
6370 if (((varp == &p_enc && *p_tenc != NUL) || varp == &p_tenc)) 6370 if (((varp == &p_enc && *p_tenc != NUL) || varp == &p_tenc))
6371 { 6371 {
6372 convert_setup(&input_conv, p_tenc, p_enc); 6372 if (convert_setup(&input_conv, p_tenc, p_enc) == FAIL
6373 convert_setup(&output_conv, p_enc, p_tenc); 6373 || convert_setup(&output_conv, p_enc, p_tenc) == FAIL)
6374 {
6375 EMSG3(_("E950: Cannot convert between %s and %s"),
6376 p_tenc, p_enc);
6377 errmsg = e_invarg;
6378 }
6374 } 6379 }
6375 6380
6376 # if defined(WIN3264) && defined(FEAT_MBYTE) 6381 # if defined(WIN3264) && defined(FEAT_MBYTE)
6377 /* $HOME may have characters in active code page. */ 6382 /* $HOME may have characters in active code page. */
6378 if (varp == &p_enc) 6383 if (varp == &p_enc)