mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-24 20:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0061: fix resetting, setting 'title' #11733

Browse Source 
Problem:    Window title is wrong after resetting and setting 'title'.
Solution:   Move resetting the title into maketitle(). (Jason Franklin)
84a9308511
This commit is contained in:
Billy SU
2020-01-22 15:47:32 +08:00
committed by Justin M. Keyes
parent 97dcc48c99
commit e53e860759
2 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/option.c
View File

@@ -2021,13 +2021,10 @@ static char_u *check_cedit(void)
// maketitle() to create and display it.
// When switching the title or icon off, call ui_set_{icon,title}(NULL) to get
// the old value back.
static void did_set_title(
int icon // Did set icon instead of title
)
static void did_set_title(void)
{
if (starting != NO_SCREEN) {
maketitle();
resettitle();
}
}
@@ -2986,7 +2983,7 @@ ambw_end:
} else {
stl_syntax &= ~flagval;
}
did_set_title(varp == &p_iconstring);
did_set_title();
} else if (varp == &p_sel) { // 'selection'
if (*p_sel == NUL
@@ -4025,9 +4022,9 @@ static char *set_bool_option(const int opt_idx, char_u *const varp,
(void)buf_init_chartab(curbuf, false); // ignore errors
} else if ((int *)varp == &p_title) {
// when 'title' changed, may need to change the title; same for 'icon'
did_set_title(false);
did_set_title();
} else if ((int *)varp == &p_icon) {
did_set_title(true);
did_set_title();
} else if ((int *)varp == &curbuf->b_changed) {
if (!value) {
save_file_ff(curbuf); // Buffer is unchanged