Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2019-04-02 21:02:37 +01:00
commit c9ef144dca

View File

@ -82,7 +82,8 @@ static const char *options_table_window_size_list[] = {
"#{?#{&&:#{window_bell_flag}," \
"#{!=:#{window-status-bell-style},default}}, " \
"#{window-status-bell-style}," \
"#{?#{&&:#{window_activity_flag}," \
"#{?#{&&:#{||:#{window_activity_flag}," \
"#{window_silence_flag}}," \
"#{!=:" \
"#{window-status-activity-style}," \
"default}}, " \
@ -103,7 +104,8 @@ static const char *options_table_window_size_list[] = {
"#{?#{&&:#{window_bell_flag}," \
"#{!=:#{window-status-bell-style},default}}, " \
"#{window-status-bell-style}," \
"#{?#{&&:#{window_activity_flag}," \
"#{?#{&&:#{||:#{window_activity_flag}," \
"#{window_silence_flag}}," \
"#{!=:" \
"#{window-status-activity-style}," \
"default}}, " \