Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2019-03-19 22:02:36 +00:00

View File

@ -74,11 +74,20 @@ static const char *options_table_window_size_list[] = {
"#[list=left-marker]<#[list=right-marker]>#[list=on]" \ "#[list=left-marker]<#[list=right-marker]>#[list=on]" \
"#{W:" \ "#{W:" \
"#[range=window|#{window_index} " \ "#[range=window|#{window_index} " \
"#{?window_last_flag, #{window-status-last-style},}" \ "#{window-status-style}" \
"#{?window_bell_flag," \ "#{?#{&&:#{window_last_flag}," \
"#{!=:#{window-status-last-style},default}}, " \
"#{window-status-last-style}," \
"}" \
"#{?#{&&:#{window_bell_flag}," \
"#{!=:#{window-status-bell-style},default}}, " \
"#{window-status-bell-style}," \ "#{window-status-bell-style}," \
"#{?window_activity_flag," \ "#{?#{&&:#{window_activity_flag}," \
" #{window-status-activity-style},}" \ "#{!=:" \
"#{window-status-activity-style}," \
"default}}, " \
"#{window-status-activity-style}," \
"}" \
"}" \ "}" \
"]" \ "]" \
"#{T:window-status-format}" \ "#{T:window-status-format}" \
@ -86,11 +95,20 @@ static const char *options_table_window_size_list[] = {
"#{?window_end_flag,,#{window-status-separator}}" \ "#{?window_end_flag,,#{window-status-separator}}" \
"," \ "," \
"#[range=window|#{window_index} list=focus " \ "#[range=window|#{window_index} list=focus " \
"#{?window_last_flag, #{window-status-last-style},}" \ "#{window-status-current-style}" \
"#{?window_bell_flag," \ "#{?#{&&:#{window_last_flag}," \
"#{!=:#{window-status-last-style},default}}, " \
"#{window-status-last-style}," \
"}" \
"#{?#{&&:#{window_bell_flag}," \
"#{!=:#{window-status-bell-style},default}}, " \
"#{window-status-bell-style}," \ "#{window-status-bell-style}," \
"#{?window_activity_flag," \ "#{?#{&&:#{window_activity_flag}," \
" #{window-status-activity-style},}" \ "#{!=:" \
"#{window-status-activity-style}," \
"default}}, " \
"#{window-status-activity-style}," \
"}" \
"}" \ "}" \
"]" \ "]" \
"#{T:window-status-current-format}" \ "#{T:window-status-current-format}" \