circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-03 16:46:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2025-08-04 16:01:07 +01:00
parent 6f9bcb7fee 05b2893b9f
commit b13005e802
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
screen-write.c
View File

@@ -1996,7 +1996,7 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
log_debug("%s: wrapped at %u,%u", __func__, s->cx, s->cy); log_debug("%s: wrapped at %u,%u", __func__, s->cx, s->cy);
screen_write_linefeed(ctx, 1, 8); screen_write_linefeed(ctx, 1, 8);
screen_write_set_cursor(ctx, 0, -1); screen_write_set_cursor(ctx, 0, -1);
screen_write_collect_flush(ctx, 1, __func__); screen_write_collect_flush(ctx, 0, __func__);
} }
/* Sanity check cursor position. */ /* Sanity check cursor position. */

12
window-copy.c
View File

@@ -4887,6 +4887,8 @@ window_copy_copy_buffer(struct window_mode_entry *wme, const char *prefix,
if (set_paste) if (set_paste)
paste_add(prefix, buf, len); paste_add(prefix, buf, len);
else
free(buf);
} }
static void * static void *
@@ -4911,9 +4913,11 @@ static void
window_copy_pipe(struct window_mode_entry *wme, struct session *s, window_copy_pipe(struct window_mode_entry *wme, struct session *s,
const char *cmd) const char *cmd)
{ {
void *buf;
size_t len; size_t len;
window_copy_pipe_run(wme, s, cmd, &len); buf = window_copy_pipe_run(wme, s, cmd, &len);
free (buf);
} }
static void static void
@@ -4924,10 +4928,11 @@ window_copy_copy_pipe(struct window_mode_entry *wme, struct session *s,
size_t len; size_t len;
buf = window_copy_pipe_run(wme, s, cmd, &len); buf = window_copy_pipe_run(wme, s, cmd, &len);
if (buf != NULL) if (buf != NULL) {
window_copy_copy_buffer(wme, prefix, buf, len, set_paste, window_copy_copy_buffer(wme, prefix, buf, len, set_paste,
set_clip); set_clip);
} }
}
static void static void
window_copy_copy_selection(struct window_mode_entry *wme, const char *prefix, window_copy_copy_selection(struct window_mode_entry *wme, const char *prefix,
@@ -4937,10 +4942,11 @@ window_copy_copy_selection(struct window_mode_entry *wme, const char *prefix,
size_t len; size_t len;
buf = window_copy_get_selection(wme, &len); buf = window_copy_get_selection(wme, &len);
if (buf != NULL) if (buf != NULL) {
window_copy_copy_buffer(wme, prefix, buf, len, set_paste, window_copy_copy_buffer(wme, prefix, buf, len, set_paste,
set_clip); set_clip);
} }
}
static void static void
window_copy_append_selection(struct window_mode_entry *wme) window_copy_append_selection(struct window_mode_entry *wme)