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

patch 8.2.4798: t_8u option was reset even when set by the user

Browse Source 
Problem:    t_8u option was reset even when set by the user.
Solution:   Only reset t_8u when using the default value. (closes #10239)
This commit is contained in:
Bram Moolenaar
2022-04-20 19:08:50 +01:00
parent 8530b41fd3
commit dbec26d789
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/term.c
View File

@@ -4826,7 +4826,9 @@ handle_version_response(int first, int *arg, int argc, char_u *tp)
// This may cause some flicker. Alternative would be to set "t_8u" // This may cause some flicker. Alternative would be to set "t_8u"
// here if the terminal is expected to support it, but that might // here if the terminal is expected to support it, but that might
// conflict with what was set in the .vimrc. // conflict with what was set in the .vimrc.
if (term_props[TPR_UNDERLINE_RGB].tpr_status != TPR_YES && *T_8U != NUL) if (term_props[TPR_UNDERLINE_RGB].tpr_status != TPR_YES
&& *T_8U != NUL
&& !option_was_set((char_u *)"t_8u"))
{ {
set_string_option_direct((char_u *)"t_8u", -1, (char_u *)"", set_string_option_direct((char_u *)"t_8u", -1, (char_u *)"",
OPT_FREE, 0); OPT_FREE, 0);

2
src/version.c
View File

@@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4798,
/**/ /**/
4797, 4797,
/**/ /**/