circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

This commit is contained in:
Thomas Adam 2021-01-06 10:01:22 +00:00
parent 5a2db4c7e8 199689954b
commit fc28e2065a
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd-join-pane.c
View File

@ -142,7 +142,10 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item)
src_wp->window = dst_w; src_wp->window = dst_w;
options_set_parent(src_wp->options, dst_w->options); options_set_parent(src_wp->options, dst_w->options);
src_wp->flags |= PANE_STYLECHANGED; src_wp->flags |= PANE_STYLECHANGED;
TAILQ_INSERT_AFTER(&dst_w->panes, dst_wp, src_wp, entry); if (flags & SPAWN_BEFORE)
TAILQ_INSERT_BEFORE(dst_wp, src_wp, entry);
else
TAILQ_INSERT_AFTER(&dst_w->panes, dst_wp, src_wp, entry);
layout_assign_pane(lc, src_wp); layout_assign_pane(lc, src_wp);
recalculate_sizes(); recalculate_sizes();

7
window-copy.c
View File

@ -3009,7 +3009,7 @@ window_copy_search_marks(struct window_mode_entry *wme, struct screen *ssp,
struct screen *s = data->backing, ss; struct screen *s = data->backing, ss;
struct screen_write_ctx ctx; struct screen_write_ctx ctx;
struct grid *gd = s->grid; struct grid *gd = s->grid;
int found, cis, which = -1, stopped = 0; int found, cis, stopped = 0;
int cflags = REG_EXTENDED; int cflags = REG_EXTENDED;
u_int px, py, i, b, nfound = 0, width; u_int px, py, i, b, nfound = 0, width;
u_int ssize = 1, start, end; u_int ssize = 1, start, end;
@ -3072,11 +3072,7 @@ again:
if (!found) if (!found)
break; break;
} }
nfound++; nfound++;
if (px == data->cx &&
py == gd->hsize + data->cy - data->oy)
which = nfound;
if (window_copy_search_mark_at(data, px, py, &b) == 0) { if (window_copy_search_mark_at(data, px, py, &b) == 0) {
if (b + width > gd->sx * gd->sy) if (b + width > gd->sx * gd->sy)
@ -3088,7 +3084,6 @@ again:
else else
data->searchgen++; data->searchgen++;
} }
px += width; px += width;
} }