diff options
| -rw-r--r-- | cmd-join-pane.c | 5 | ||||
| -rw-r--r-- | window-copy.c | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/cmd-join-pane.c b/cmd-join-pane.c index 306cf4bc..36805c46 100644 --- a/cmd-join-pane.c +++ b/cmd-join-pane.c @@ -142,7 +142,10 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item) src_wp->window = dst_w; options_set_parent(src_wp->options, dst_w->options); 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); recalculate_sizes(); diff --git a/window-copy.c b/window-copy.c index d6af397f..4c81cb1f 100644 --- a/window-copy.c +++ b/window-copy.c @@ -3009,7 +3009,7 @@ window_copy_search_marks(struct window_mode_entry *wme, struct screen *ssp, struct screen *s = data->backing, ss; struct screen_write_ctx ctx; struct grid *gd = s->grid; - int found, cis, which = -1, stopped = 0; + int found, cis, stopped = 0; int cflags = REG_EXTENDED; u_int px, py, i, b, nfound = 0, width; u_int ssize = 1, start, end; @@ -3072,11 +3072,7 @@ again: if (!found) break; } - 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 (b + width > gd->sx * gd->sy) @@ -3088,7 +3084,6 @@ again: else data->searchgen++; } - px += width; } |