Make replacement of ##s consistent when drawing formats, whether

followed by [ or not. Add a flag (e) to the q: format modifier to double
up #s and use it for the window_flags format variable so it doesn't end
up escaping any following text. GitHub issue 2485.
This commit is contained in:
nicm
2020-12-01 08:12:58 +00:00
parent 33046ecee2
commit 9a74bba007
4 changed files with 43 additions and 8 deletions

View File

@ -1014,7 +1014,7 @@ const struct options_table_entry options_table[] = {
{ .name = "window-status-current-format",
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW,
.default_str = "#I:#W#{?window_flags,#{window_flags}, }",
.default_str = "#I:#W#{?window_flags,#{q/e:window_flags}, }",
.text = "Format of the current window in the status line."
},
@ -1030,7 +1030,7 @@ const struct options_table_entry options_table[] = {
{ .name = "window-status-format",
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW,
.default_str = "#I:#W#{?window_flags,#{window_flags}, }",
.default_str = "#I:#W#{?window_flags,#{q/e:window_flags}, }",
.text = "Format of windows in the status line, except the current "
"window."
},