To: vim_dev@googlegroups.com Subject: Patch 8.2.4798 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.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) Files: src/term.c *** ../vim-8.2.4797/src/term.c 2022-04-17 19:20:27.117987300 +0100 --- src/term.c 2022-04-20 19:06:21.325346861 +0100 *************** *** 4826,4832 **** // 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) { set_string_option_direct((char_u *)"t_8u", -1, (char_u *)"", OPT_FREE, 0); --- 4826,4834 ---- // 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 ! && !option_was_set((char_u *)"t_8u")) { set_string_option_direct((char_u *)"t_8u", -1, (char_u *)"", OPT_FREE, 0); *** ../vim-8.2.4797/src/version.c 2022-04-20 19:00:32.849452382 +0100 --- src/version.c 2022-04-20 19:08:31.685298141 +0100 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 4798, /**/ -- "Space is big. Really big. You just won't believe how vastly hugely mind- bogglingly big it is. I mean, you may think it's a long way down the road to the chemist, but that's just peanuts to space." -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///