circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-07 02:04:22 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* refs/remotes/tmux-openbsd/master:
  Improve text about status lines, GitHub issue 5677.
  Redraw selections after scrolling to line boundaries, GitHub issue 5689 from bugreporter23 at gmail dot com.
This commit is contained in:
tmux update bot
2026-10-06 09:16:23 +00:00
parent c067a0b1bf d6237b5b87
commit f22e1d95b2
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tmux.1
View File

@@ -1,4 +1,4 @@
.\" $OpenBSD: tmux.1,v 1.1174 2026/09/25 13:44:49 nicm Exp $ .\" $OpenBSD: tmux.1,v 1.1175 2026/10/06 08:01:54 nicm Exp $
.\" .\"
.\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> .\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
.\" .\"
@@ -14,7 +14,7 @@
.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\" .\"
.Dd $Mdocdate: September 25 2026 $ .Dd $Mdocdate: October 6 2026 $
.Dt TMUX 1 .Dt TMUX 1
.Os .Os
.Sh NAME .Sh NAME
@@ -4680,6 +4680,9 @@ flag unsets an option, so a session inherits the option from the global
options (or with options (or with
.Fl g , .Fl g ,
restores a global option to the default). restores a global option to the default).
For an array option given with a key,
.Fl u
removes only that item.
.Fl U .Fl U
unsets an option (like unsets an option (like
.Fl u ) .Fl u )
@@ -5545,8 +5548,18 @@ or
more rows. more rows.
.It Ic status\-format[] Ar format .It Ic status\-format[] Ar format
Specify the format to be used for each line of the status line. Specify the format to be used for each line of the status line.
The default builds the top status line from the various individual status The default first status line is built from the various individual status
options below. options below, the second shows the panes in the current window and the third
the sessions.
A default line may be extended rather than replaced by saving its default value
in a user option and expanding that in the new value, for example:
.Bd -literal -offset indent
set \-g status 2
set \-gu status\-format # start with default status line
set \-gF @old_status_format1 "#{status\-format[1]}"
set \-g status\-format[1] "#{E:@old_status_format1}#[nolist align=right]#{pane_current_path}"
.Ed
.Pp
.It Ic status\-interval Ar interval .It Ic status\-interval Ar interval
Update the status line every Update the status line every
.Ar interval .Ar interval

11
window-copy.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: window-copy.c,v 1.433 2026/10/05 15:52:25 nicm Exp $ */ /* $OpenBSD: window-copy.c,v 1.434 2026/10/06 07:57:41 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -7254,13 +7254,16 @@ static void
window_copy_acquire_cursor_up(struct window_mode_entry *wme, u_int hsize, window_copy_acquire_cursor_up(struct window_mode_entry *wme, u_int hsize,
u_int oy, u_int oldy, u_int px, u_int py) u_int oy, u_int oldy, u_int px, u_int py)
{ {
struct window_copy_mode_data *data = wme->data;
u_int cy, yy, ny, nd; u_int cy, yy, ny, nd;
yy = hsize - oy; yy = hsize - oy;
if (py < yy) { if (py < yy) {
ny = yy - py; ny = yy - py;
cy = 0; cy = 0;
nd = 1; nd = oldy + ny + 1;
if (nd > screen_size_y(&data->screen))
nd = screen_size_y(&data->screen);
} else { } else {
ny = 0; ny = 0;
cy = py - yy; cy = py - yy;
@@ -7286,8 +7289,8 @@ window_copy_acquire_cursor_down(struct window_mode_entry *wme, u_int hsize,
yy = sy - 1; yy = sy - 1;
if (cy > yy) { if (cy > yy) {
ny = cy - yy; ny = cy - yy;
oldy = yy; oldy = oldy > ny ? oldy - ny : 0;
nd = 1; nd = sy - oldy;
} else { } else {
ny = 0; ny = 0;
nd = cy - oldy + 1; nd = cy - oldy + 1;