# HG changeset patch # User Bram Moolenaar # Date 1650478504 -7200 # Node ID a54564337e897120d85e5b67c517f471b9fb5948 # Parent 870e183f36aa6339daa74e104611f00554907acc patch 8.2.4798: t_8u option was reset even when set by the user Commit: https://github.com/vim/vim/commit/dbec26d7893dca4ff38fa4b96ac91203d30ccae5 Author: Bram Moolenaar Date: Wed Apr 20 19:08:50 2022 +0100 patch 8.2.4798: t_8u option was reset even when set by the user Problem: t_8u option was reset even when set by the user. Solution: Only reset t_8u when using the default value. (closes https://github.com/vim/vim/issues/10239) diff --git a/src/term.c b/src/term.c --- a/src/term.c +++ b/src/term.c @@ -4826,7 +4826,9 @@ handle_version_response(int first, int * // This may cause some flicker. Alternative would be to set "t_8u" // here if the terminal is expected to support it, but that might // 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 *)"", OPT_FREE, 0); diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4798, +/**/ 4797, /**/ 4796,