circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-09 03:34:25 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* 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
parent 5512949947 ddd0698e30
commit 9286115b43
5 changed files with 136 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
options-table.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: options-table.c,v 1.249 2026/10/05 09:03:11 nicm Exp $ */
/* $OpenBSD: options-table.c,v 1.251 2026/10/07 12:59:50 nicm Exp $ */
/*
* Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1414,8 +1414,12 @@ const struct options_table_entry options_table[] = {
"#{t/p:top_line_time}#{?#{e|>:#{top_line_time},0}, ,}"
"[#{copy_position}/#{copy_position_limit}]"
"#{?search_timed_out, (timed out),"
"#{?search_count, (#{search_count}"
"#{?search_count_partial,+,} results),}}",
"#{?search_count_present, ("
"#{?#{==:#{search_count},0},0 matches,"
"#{?search_count_partial,#{search_count}+ matches,"
"#{?#{==:#{search_count},1},1 of 1 match,"
"#{?search_count_current,#{search_count_current} of "
"#{search_count} matches,#{search_count} matches}}}}),}}",
.text = "Format of the position indicator in copy mode."
},
@@ -1777,6 +1781,14 @@ const struct options_table_entry options_table[] = {
.text = "Default style of the active pane."
},
{ .name = "window-default-command",
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW,
.default_str = "",
.text = "Default command to run in new panes. If set, "
"overrides 'default-command'."
},
{ .name = "window-pane-current-status-format",
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW,