Merge branch 'obsd-master' into master

1 files changed, 6 insertions, 4 deletions

diff --git a/tty.c b/tty.c
index e4800ec2..0f295f6c 100644
--- a/tty.c
+++ b/tty.c
@@ -692,10 +692,12 @@ tty_update_cursor(struct tty *tty, int mode, int changed, struct screen *s)
 	tty_putcode(tty, TTYC_CNORM);
 	switch (cstyle) {
 	case SCREEN_CURSOR_DEFAULT:
-		if (tty_term_has(tty->term, TTYC_SE))
-			tty_putcode(tty, TTYC_SE);
-		else
-			tty_putcode1(tty, TTYC_SS, 0);
+		if (tty->cstyle != SCREEN_CURSOR_DEFAULT) {
+			if (tty_term_has(tty->term, TTYC_SE))
+				tty_putcode(tty, TTYC_SE);
+			else
+				tty_putcode1(tty, TTYC_SS, 0);
+		}
 		if (mode & (MODE_CURSOR_BLINKING|MODE_CURSOR_VERY_VISIBLE))
 			tty_putcode(tty, TTYC_CVVIS);
 		break;