mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-13 23:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2025-09-09 12:01:09 +01:00
parent d4f129b513 50dafd6187
commit ac574b6782
4 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
screen-write.c
View File

@@ -576,7 +576,6 @@ screen_write_fast_copy(struct screen_write_ctx *ctx, struct screen *src,
if (nx == 0 || ny == 0) if (nx == 0 || ny == 0)
return; return;
cy = s->cy;
for (yy = py; yy < py + ny; yy++) { for (yy = py; yy < py + ny; yy++) {
if (yy >= gd->hsize + gd->sy) if (yy >= gd->hsize + gd->sy)
break; break;

5
server-client.c
View File

@@ -596,7 +596,6 @@ server_client_check_mouse_in_pane(struct window_pane *wp, u_int px, u_int py,
sb = options_get_number(wo, "pane-scrollbars"); sb = options_get_number(wo, "pane-scrollbars");
sb_pos = options_get_number(wo, "pane-scrollbars-position"); sb_pos = options_get_number(wo, "pane-scrollbars-position");
pane_status = options_get_number(wo, "pane-border-status"); pane_status = options_get_number(wo, "pane-border-status");
sb_pos = options_get_number(wo, "pane-scrollbars-position");
if (window_pane_show_scrollbar(wp, sb)) { if (window_pane_show_scrollbar(wp, sb)) {
sb_w = wp->scrollbar_style.width; sb_w = wp->scrollbar_style.width;
@@ -655,11 +654,9 @@ server_client_check_mouse_in_pane(struct window_pane *wp, u_int px, u_int py,
fwp->xoff + fwp->sx >= px)) fwp->xoff + fwp->sx >= px))
break; break;
} }
if (fwp != NULL) { if (fwp != NULL)
wp = fwp;
return (BORDER); return (BORDER);
} }
}
return (NOWHERE); return (NOWHERE);
} }

2
server-fn.c
View File

@@ -427,7 +427,7 @@ void
server_destroy_session(struct session *s) server_destroy_session(struct session *s)
{ {
struct client *c; struct client *c;
struct session *s_new = NULL, *cs_new, *use_s; struct session *s_new = NULL, *cs_new = NULL, *use_s;
int detach_on_destroy; int detach_on_destroy;
detach_on_destroy = options_get_number(s->options, "detach-on-destroy"); detach_on_destroy = options_get_number(s->options, "detach-on-destroy");

3
window-buffer.c
View File

@@ -158,7 +158,7 @@ window_buffer_build(void *modedata, struct mode_tree_sort_criteria *sort_crit,
struct window_buffer_modedata *data = modedata; struct window_buffer_modedata *data = modedata;
struct window_buffer_itemdata *item; struct window_buffer_itemdata *item;
u_int i; u_int i;
struct paste_buffer *pb; struct paste_buffer *pb = NULL;
char *text, *cp; char *text, *cp;
struct format_tree *ft; struct format_tree *ft;
struct session *s = NULL; struct session *s = NULL;
@@ -171,7 +171,6 @@ window_buffer_build(void *modedata, struct mode_tree_sort_criteria *sort_crit,
data->item_list = NULL; data->item_list = NULL;
data->item_size = 0; data->item_size = 0;
pb = NULL;
while ((pb = paste_walk(pb)) != NULL) { while ((pb = paste_walk(pb)) != NULL) {
item = window_buffer_add_item(data); item = window_buffer_add_item(data);
item->name = xstrdup(paste_buffer_name(pb)); item->name = xstrdup(paste_buffer_name(pb));