Merge branch 'master' into image_merge

This commit is contained in:
Nicholas Marriott
2026-10-14 15:37:37 +01:00
2 changed files with 3 additions and 3 deletions

View File

@@ -1,4 +1,4 @@
/* $OpenBSD: screen-redraw.c,v 1.167 2026/10/14 12:51:00 nicm Exp $ */ /* $OpenBSD: screen-redraw.c,v 1.168 2026/10/14 13:03:47 nicm Exp $ */
/* /*
* Copyright (c) 2026 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2026 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -2280,7 +2280,7 @@ redraw_client_damage(struct client *c)
} }
tty_sync_start(tty); tty_sync_start(tty);
tty_update_mode(tty, c->tty.mode & ~CURSOR_MODES, NULL); tty_update_mode(tty, tty->mode & ~CURSOR_MODES, NULL);
TAILQ_FOREACH(rd, &w->damage, entry) { TAILQ_FOREACH(rd, &w->damage, entry) {
#ifdef ENABLE_IMAGES #ifdef ENABLE_IMAGES

View File

@@ -1,4 +1,4 @@
/* $OpenBSD: tty-keys.c,v 1.218 2026/10/14 08:33:19 nicm Exp $ */ /* $OpenBSD: tty-keys.c,v 1.219 2026/10/14 13:03:47 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>