aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

Fix: terminal title not properly restured when there are multi-byte

Browse Source 
characters.  (partly by James Vega)
This commit is contained in:
Bram Moolenaar
2010-07-25 22:30:20 +02:00
parent c3301874a6
commit f82bac3717
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/os_unix.c
View File

@@ -1821,15 +1821,19 @@ get_x11_thing(get_title, test_only)
retval = TRUE;
if (!test_only)
{
#ifdef FEAT_XFONTSET
if (text_prop.encoding == XA_STRING)
#if defined(FEAT_XFONTSET) || defined(FEAT_MBYTE)
if (text_prop.encoding == XA_STRING
# ifdef FEAT_MBYTE
&& !has_mbyte
# endif
)
{
#endif
if (get_title)
oldtitle = vim_strsave((char_u *)text_prop.value);
else
oldicon = vim_strsave((char_u *)text_prop.value);
#ifdef FEAT_XFONTSET
#if defined(FEAT_XFONTSET) || defined(FEAT_MBYTE)
}
else
{
@@ -2020,7 +2024,7 @@ mch_settitle(title, icon)
#endif
/*
* Note: if "t_TS" is set, title is set with escape sequence rather
* Note: if "t_ts" is set, title is set with escape sequence rather
* than x11 calls, because the x11 calls don't always work
*/
if ((type || *T_TS != NUL) && title != NULL)