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

* refs/remotes/tmux-openbsd/master:
  Show match count in copy mode, GitHub issue 5399.
  Add window-default-command option to override default-command per window, from Meriel Sartha Mittelbach.
  Do not change active pane if joining a pane to the same window. Reported by David le Blanc.
This commit is contained in:
tmux update bot
2026-10-07 13:58:41 +00:00
5 changed files with 136 additions and 25 deletions

13
tmux.1
View File

@@ -1,4 +1,4 @@
.\" $OpenBSD: tmux.1,v 1.1177 2026/10/06 17:45:26 schwarze Exp $
.\" $OpenBSD: tmux.1,v 1.1179 2026/10/07 12:59:50 nicm Exp $
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
.\"
@@ -14,7 +14,7 @@
.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.Dd $Mdocdate: October 6 2026 $
.Dd $Mdocdate: October 7 2026 $
.Dt TMUX 1
.Os
.Sh NAME
@@ -3621,6 +3621,8 @@ is the command to execute.
If
.Ar shell\-command
is not specified, the value of the
.Ic window\-default\-command
or
.Ic default\-command
option is used.
.Fl c
@@ -6181,6 +6183,11 @@ see the
.Sx STYLES
section.
.Pp
.It Ic window\-default\-command Ar shell\-command
Per-window version of the
.Ic default\-command
option.
.Pp
.It Ic window\-status\-activity\-style Ar style
Set status line style for windows with an activity alert.
For how to specify
@@ -7483,7 +7490,9 @@ The following variables are available, where appropriate:
.It Li "scroll_region_lower" Ta "" Ta "Bottom of scroll region in pane"
.It Li "scroll_region_upper" Ta "" Ta "Top of scroll region in pane"
.It Li "search_count" Ta "" Ta "Count of search results"
.It Li "search_count_current" Ta "" Ta "Index of the current search result"
.It Li "search_count_partial" Ta "" Ta "1 if search count is partial count"
.It Li "search_count_present" Ta "" Ta "1 if search count is available"
.It Li "search_match" Ta "" Ta "Search match if any"
.It Li "search_present" Ta "" Ta "1 if search started in copy mode"
.It Li "selection_active" Ta "" Ta "1 if selection started and changes with the cursor in copy mode"