diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-04-20 19:08:50 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-04-20 19:08:50 +0100 |
| commit | dbec26d7893dca4ff38fa4b96ac91203d30ccae5 (patch) | |
| tree | 15690eaa1fef5e482e0ddab723af842ab1dbc606 | |
| parent | 8530b41fd3872c9a1349b083470d565677948518 (diff) | |
patch 8.2.4798: t_8u option was reset even when set by the userv8.2.4798
Problem: t_8u option was reset even when set by the user.
Solution: Only reset t_8u when using the default value. (closes #10239)
| -rw-r--r-- | src/term.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/term.c b/src/term.c index abc8a383ec..0f80e9c40b 100644 --- a/src/term.c +++ b/src/term.c @@ -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" // 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 index 6bed251bb1..83d8e1b495 100644 --- 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, |