mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-07-22 08:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* refs/remotes/tmux-openbsd/master:
  Typos and doc fixes, from Ben Boeckel.
This commit is contained in:
tmux update bot
2026-07-14 17:24:20 +00:00
parent d705471aa5 34a11db6ca
commit 145f8ef173
4 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd-split-window.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: cmd-split-window.c,v 1.143 2026/07/13 16:07:47 nicm Exp $ */
/* $OpenBSD: cmd-split-window.c,v 1.144 2026/07/14 15:06:54 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -59,10 +59,10 @@ const struct cmd_entry cmd_split_window_entry = {
.name = "split-window",
.alias = "splitw",
.args = { "bc:de:EfF:hIkl:m:p:PR:s:S:t:T:vWZ", 0, -1, NULL },
.usage = "[-bdefhIklPvWZ] [-c start-directory] [-e environment] "
"[-F format] [-l size] [-m message] [-p percentage] "
"[-s style] [-S active-border-style] "
.args = { "bB:c:de:EfF:hIkl:m:p:PR:s:S:t:T:vWZ", 0, -1, NULL },
.usage = "[-bdefhIklPvWZ] [-B border-lines] [-c start-directory] "
"[-e environment] [-F format] [-l size] [-m message] "
"[-p percentage] [-s style] [-S active-border-style] "
"[-R inactive-border-style] [-T title] "
CMD_TARGET_PANE_USAGE " [shell-command [argument ...]]",

8
format.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: format.c,v 1.403 2026/07/10 15:20:06 nicm Exp $ */
/* $OpenBSD: format.c,v 1.404 2026/07/14 15:06:54 nicm Exp $ */
/*
* Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -85,13 +85,13 @@ format_job_cmp(struct format_job *fj1, struct format_job *fj2)
return (strcmp(fj1->cmd, fj2->cmd));
}
/* Maimum pad and trim width. */
/* Maximum pad and trim width. */
#define FORMAT_MAX_WIDTH 10000
/* Maimum repeat size. */
/* Maximum repeat size. */
#define FORMAT_MAX_REPEAT 10000
/* Maimum precision. */
/* Maximum precision. */
#define FORMAT_MAX_PRECISION 100
/* Format modifiers. */

11
tmux.1
View File

@@ -1,4 +1,4 @@
.\" $OpenBSD: tmux.1,v 1.1138 2026/07/13 22:03:08 nicm Exp $
.\" $OpenBSD: tmux.1,v 1.1139 2026/07/14 15:06:54 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: July 13 2026 $
.Dd $Mdocdate: July 14 2026 $
.Dt TMUX 1
.Os
.Sh NAME
@@ -850,6 +850,7 @@ Each has a single-character alternative form.
.It Li "{next}" Ta "+" Ta "The next window by number"
.It Li "{previous}" Ta "\-" Ta "The previous window by number"
.It Li "{current}" Ta "@" Ta "The current window"
.It Li "{mouse}" Ta "=" Ta "The window where the mouse event happened"
.El
.Pp
.Ar target\-pane
@@ -883,6 +884,8 @@ The following special tokens are available for the pane index:
.It Li "{left\-of}" Ta "" Ta "The pane to the left of the active pane"
.It Li "{right\-of}" Ta "" Ta "The pane to the right of the active pane"
.It Li "{active}" Ta "@" Ta "The active pane"
.It Li "{marked}" Ta "~" Ta "The marked pane"
.It Li "{mouse}" Ta "=" Ta "The pane where the mouse event happened"
.El
.Pp
The tokens
@@ -4037,6 +4040,7 @@ the command behaves like
.Tg splitw
.It Xo Ic split\-window
.Op Fl bdefhIkPvZ
.Op Fl B Ar border\-lines
.Op Fl c Ar start\-directory
.Op Fl e Ar environment
.Op Fl F Ar format
@@ -4084,6 +4088,9 @@ may be followed by
to specify a percentage of the available space.
.Fl p
is a shorthand option for this.
.Fl B
sets the pane border lines for floating panes; see
.Ic pane\-border\-lines .
The
.Fl b
option causes the new pane to be created to the left of or above

8
window-copy.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: window-copy.c,v 1.419 2026/07/14 11:08:36 nicm Exp $ */
/* $OpenBSD: window-copy.c,v 1.420 2026/07/14 15:06:54 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -5573,7 +5573,8 @@ window_copy_update_cursor(struct window_mode_entry *wme, u_int cx, u_int cy)
if (window_copy_line_numbers_active(wme)) {
width = window_copy_line_number_width(wme);
if (s->sel != NULL || data->lineflag != LINE_SEL_NONE ||
if (s->sel != NULL ||
data->lineflag != LINE_SEL_NONE ||
old_cy != data->cy) {
window_copy_redraw_screen(wme);
return;
@@ -6809,9 +6810,8 @@ window_copy_scroll_up(struct window_mode_entry *wme, u_int ny)
window_copy_write_line(wme, &ctx, 1);
if (screen_size_y(s) > 3)
window_copy_write_line(wme, &ctx, screen_size_y(s) - 2);
if (s->sel != NULL && screen_size_y(s) > ny) {
if (s->sel != NULL && screen_size_y(s) > ny)
window_copy_write_line(wme, &ctx, screen_size_y(s) - ny - 1);
}
screen_write_cursormove(&ctx,
window_copy_cursor_offset(wme, data->cx, screen_size_x(s)),
data->cy, 0);