From 8a9450e581fa3b8082dfe603f505273dfc199964 Mon Sep 17 00:00:00 2001
From: millert <millert@openbsd.org>
Date: Thu, 16 Nov 2023 16:03:51 +0000
Subject: [PATCH] Use tset -I for all terminals, not just xterm.

Terminal initialization is usually only needed for hardware terminals,
which are rare these days, and the initialization strings result
in a bunch of extra newlines on pseudo-terminals.  OK nicm@
---
 etc/root/dot.login   | 8 ++------
 etc/root/dot.profile | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/etc/root/dot.login b/etc/root/dot.login
index a347eb86805..1f5791e3483 100644
--- a/etc/root/dot.login
+++ b/etc/root/dot.login
@@ -1,15 +1,11 @@
-# $OpenBSD: dot.login,v 1.14 2009/12/20 15:35:35 deraadt Exp $
+# $OpenBSD: dot.login,v 1.15 2023/11/16 16:03:51 millert Exp $
 #
 # csh login file
 
 if ( -x /usr/bin/tset ) then
 	set noglob histchars=""
 	onintr finish
-	if ( $?XTERM_VERSION ) then
-		eval `tset -IsQ '-munknown:?vt220' $TERM`
-	else
-		eval `tset -sQ '-munknown:?vt220' $TERM`
-	endif
+	eval `tset -IsQ '-munknown:?vt220' $TERM`
 	finish:
 	unset noglob histchars
 	onintr
diff --git a/etc/root/dot.profile b/etc/root/dot.profile
index 1332dbf0807..25b89cb62a4 100644
--- a/etc/root/dot.profile
+++ b/etc/root/dot.profile
@@ -1,4 +1,4 @@
-# $OpenBSD: dot.profile,v 1.9 2010/12/13 12:54:31 millert Exp $
+# $OpenBSD: dot.profile,v 1.10 2023/11/16 16:03:51 millert Exp $
 #
 # sh/ksh initialization
 
@@ -11,11 +11,7 @@ umask 022
 case "$-" in
 *i*)    # interactive shell
 	if [ -x /usr/bin/tset ]; then
-		if [ X"$XTERM_VERSION" = X"" ]; then
-			eval `/usr/bin/tset -sQ '-munknown:?vt220' $TERM`
-		else
-			eval `/usr/bin/tset -IsQ '-munknown:?vt220' $TERM`
-		fi
+		eval `/usr/bin/tset -IsQ '-munknown:?vt220' $TERM`
 	fi
 	;;
 esac
-- 
2.20.1