circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-10 12:14:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/tmux-openbsd/master'

Browse Source 
* refs/remotes/tmux-openbsd/master:
  Use window-status-separator in second and theird status lines, GitHub issue 5672. Also match width of session name correctly.
  Fix color range check, from Vaibhav Aggarwal.
  Do not lose a pending pane resize when entering the alternate screen, from mml00 dot work at gmail dot com.
  Adjust widths of a few codepoints incorrectly set to double width, from Sidney Cammeresi.
This commit is contained in:
tmux update bot
2026-10-05 12:43:43 +00:00
parent 2b5b538152 bd4a63ab34
commit 62c6d79a80
5 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
options-table.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: options-table.c,v 1.248 2026/10/02 15:04:27 nicm Exp $ */
/* $OpenBSD: options-table.c,v 1.249 2026/10/05 09:03:11 nicm Exp $ */
/*
* Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -183,7 +183,8 @@ static const char *options_table_copy_mode_line_numbers_list[] = {
"#[pop-default]" \
"#[norange default]"
#define OPTIONS_TABLE_STATUS_FORMAT2 \
"#[align=left]#{R: ,#{n:#{session_name}}}P: " \
"#[align=left]" \
"#{R: ,#{e|-:#{w;T;=/#{status-left-length}:status-left},3}}P: " \
"#[norange default]" \
"#[list=on align=#{status-justify}]" \
"#[list=left-marker]<#[list=right-marker]>#[list=on]" \
@@ -194,7 +195,8 @@ static const char *options_table_copy_mode_line_numbers_list[] = {
"#[push-default]" \
"#{T:window-pane-status-format}" \
"#[pop-default]" \
"#[norange list=on default] " \
"#[norange list=on default]" \
"#{?loop_last_flag,,#{E:window-status-separator}}" \
"," \
"#[range=pane|#{pane_id} list=focus " \
"#{?#{!=:#{E:pane-status-current-style},default}," \
@@ -205,10 +207,12 @@ static const char *options_table_copy_mode_line_numbers_list[] = {
"#[push-default]" \
"#{T:window-pane-current-status-format}" \
"#[pop-default]" \
"#[norange list=on default] " \
"#[norange list=on default]" \
"#{?loop_last_flag,,#{E:window-status-separator}}" \
"}"
#define OPTIONS_TABLE_STATUS_FORMAT3 \
"#[align=left]#{R: ,#{n:#{session_name}}}S: " \
"#[align=left]" \
"#{R: ,#{e|-:#{w;T;=/#{status-left-length}:status-left},3}}S: " \
"#[norange default]" \
"#[list=on align=#{status-justify}]" \
"#[list=left-marker]<#[list=right-marker]>#[list=on]" \