From 9a74bba007a60b93d1fdf68772e5cfb61b3558ff Mon Sep 17 00:00:00 2001 From: nicm Date: Tue, 1 Dec 2020 08:12:58 +0000 Subject: 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. --- options-table.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'options-table.c') diff --git a/options-table.c b/options-table.c index 2ae49d7a..56e1c895 100644 --- a/options-table.c +++ b/options-table.c @@ -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." }, -- cgit