mirror of
https://github.com/tmux/tmux.git
synced 2025-01-10 01:58:51 +00:00
Fix merge error, from Jakub Łukasiewicz.
This commit is contained in:
parent
a9841a6d1e
commit
62f657845e
2
input.c
2
input.c
@ -2259,6 +2259,7 @@ input_dcs_dispatch(struct input_ctx *ictx)
|
|||||||
if (ictx->flags & INPUT_DISCARD) {
|
if (ictx->flags & INPUT_DISCARD) {
|
||||||
log_debug("%s: %zu bytes (discard)", __func__, len);
|
log_debug("%s: %zu bytes (discard)", __func__, len);
|
||||||
return (0);
|
return (0);
|
||||||
|
}
|
||||||
#ifdef ENABLE_SIXEL
|
#ifdef ENABLE_SIXEL
|
||||||
if (buf[0] == 'q') {
|
if (buf[0] == 'q') {
|
||||||
si = sixel_parse(buf, len, w->xpixel, w->ypixel);
|
si = sixel_parse(buf, len, w->xpixel, w->ypixel);
|
||||||
@ -2266,7 +2267,6 @@ input_dcs_dispatch(struct input_ctx *ictx)
|
|||||||
screen_write_sixelimage(sctx, si, ictx->cell.cell.bg);
|
screen_write_sixelimage(sctx, si, ictx->cell.cell.bg);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
|
||||||
|
|
||||||
allow_passthrough = options_get_number(wp->options, "allow-passthrough");
|
allow_passthrough = options_get_number(wp->options, "allow-passthrough");
|
||||||
if (!allow_passthrough)
|
if (!allow_passthrough)
|
||||||
|
Loading…
Reference in New Issue
Block a user