From 34a11db6ca92c0bb524987062182b51ae2e23aa3 Mon Sep 17 00:00:00 2001 From: nicm Date: Tue, 14 Jul 2026 15:06:54 +0000 Subject: [PATCH] Typos and doc fixes, from Ben Boeckel. --- cmd-split-window.c | 10 +++++----- format.c | 8 ++++---- tmux.1 | 11 +++++++++-- window-copy.c | 8 ++++---- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/cmd-split-window.c b/cmd-split-window.c index a36f05603..caaa7c02e 100644 --- a/cmd-split-window.c +++ b/cmd-split-window.c @@ -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 @@ -60,10 +60,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 ...]]", diff --git a/format.c b/format.c index 6175f0d0d..77be4edb9 100644 --- a/format.c +++ b/format.c @@ -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 @@ -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. */ diff --git a/tmux.1 b/tmux.1 index 0620f2485..ca0ba018b 100644 --- a/tmux.1 +++ b/tmux.1 @@ -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 .\" @@ -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 @@ -848,6 +848,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 @@ -881,6 +882,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 @@ -4035,6 +4038,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 @@ -4082,6 +4086,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 diff --git a/window-copy.c b/window-copy.c index d1b83a6bf..0991a387c 100644 --- a/window-copy.c +++ b/window-copy.c @@ -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 @@ -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);