circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-04 19:58:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam 2021-08-13 00:01:19 +01:00
commit f725f9bc8a
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
options-table.c
View File

@ -80,7 +80,7 @@ static const char *options_table_extended_keys_list[] = {
/* Status line format. */
#define OPTIONS_TABLE_STATUS_FORMAT1 \
"#[align=left range=left #{status-left-style}]" \
"#[align=left range=left #{E:status-left-style}]" \
"#[push-default]" \
"#{T;=/#{status-left-length}:status-left}" \
"#[pop-default]" \
@ -89,20 +89,20 @@ static const char *options_table_extended_keys_list[] = {
"#[list=left-marker]<#[list=right-marker]>#[list=on]" \
"#{W:" \
"#[range=window|#{window_index} " \
"#{window-status-style}" \
"#{E:window-status-style}" \
"#{?#{&&:#{window_last_flag}," \
"#{!=:#{window-status-last-style},default}}, " \
"#{window-status-last-style}," \
"#{!=:#{E:window-status-last-style},default}}, " \
"#{E:window-status-last-style}," \
"}" \
"#{?#{&&:#{window_bell_flag}," \
"#{!=:#{window-status-bell-style},default}}, " \
"#{window-status-bell-style}," \
"#{!=:#{E:window-status-bell-style},default}}, " \
"#{E:window-status-bell-style}," \
"#{?#{&&:#{||:#{window_activity_flag}," \
"#{window_silence_flag}}," \
"#{!=:" \
"#{window-status-activity-style}," \
"#{E:window-status-activity-style}," \
"default}}, " \
"#{window-status-activity-style}," \
"#{E:window-status-activity-style}," \
"}" \
"}" \
"]" \
@ -113,23 +113,23 @@ static const char *options_table_extended_keys_list[] = {
"#{?window_end_flag,,#{window-status-separator}}" \
"," \
"#[range=window|#{window_index} list=focus " \
"#{?#{!=:#{window-status-current-style},default}," \
"#{window-status-current-style}," \
"#{window-status-style}" \
"#{?#{!=:#{E:window-status-current-style},default}," \
"#{E:window-status-current-style}," \
"#{E:window-status-style}" \
"}" \
"#{?#{&&:#{window_last_flag}," \
"#{!=:#{window-status-last-style},default}}, " \
"#{window-status-last-style}," \
"#{!=:#{E:window-status-last-style},default}}, " \
"#{E:window-status-last-style}," \
"}" \
"#{?#{&&:#{window_bell_flag}," \
"#{!=:#{window-status-bell-style},default}}, " \
"#{window-status-bell-style}," \
"#{!=:#{E:window-status-bell-style},default}}, " \
"#{E:window-status-bell-style}," \
"#{?#{&&:#{||:#{window_activity_flag}," \
"#{window_silence_flag}}," \
"#{!=:" \
"#{window-status-activity-style}," \
"#{E:window-status-activity-style}," \
"default}}, " \
"#{window-status-activity-style}," \
"#{E:window-status-activity-style}," \
"}" \
"}" \
"]" \
@ -139,7 +139,7 @@ static const char *options_table_extended_keys_list[] = {
"#[norange list=on default]" \
"#{?window_end_flag,,#{window-status-separator}}" \
"}" \
"#[nolist align=right range=right #{status-right-style}]" \
"#[nolist align=right range=right #{E:status-right-style}]" \
"#[push-default]" \
"#{T;=/#{status-right-length}:status-right}" \
"#[pop-default]" \

2
style.c
View File

@ -51,7 +51,7 @@ int
style_parse(struct style *sy, const struct grid_cell *base, const char *in)
{
struct style saved;
const char delimiters[] = " ,", *cp;
const char delimiters[] = " ,\n", *cp;
char tmp[256], *found;
int value;
size_t end;