summaryrefslogtreecommitdiff
path: root/usr.bin/tset
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2019-03-12 11:01:26 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2019-03-12 11:01:26 +0000
commitbf3b2b3954f062c42cec536e1c766d1d41097483 (patch)
treeac7b55e2e30266d501c1ecba382d419f91299390 /usr.bin/tset
parentafc30a26a0fdafd3b60cdafc6d8492551fa60d47 (diff)
Almost all terminals now support hardware tabs so default to OXTABS
off. This makes three changes: adds the ht capability to the standard lines in gettytab(5); removes OXTABS from TTYDEF_OFLAG in ttydefaults.h (the defaults used by pty(4) - diff from martijn); and only sets OXTABS on terminals which lack hts and tbc in tset(1) (from Thomas Dickey upstream). Addresses problems reported by tedu. ok millert
Diffstat (limited to 'usr.bin/tset')
-rw-r--r--usr.bin/tset/tset.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index 82b9d5280ff..49861a22181 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tset.c,v 1.39 2015/11/16 03:02:40 deraadt Exp $ */
+/* $OpenBSD: tset.c,v 1.40 2019/03/12 11:01:25 nicm Exp $ */
/****************************************************************************
* Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *
@@ -928,7 +928,7 @@ set_conversions(void)
#endif /* __OBSOLETE__ */
#ifdef OXTABS
/* test used to be tgetflag("pt") */
- if (has_hardware_tabs) /* Print tabs. */
+ if (VALID_STRING(set_tab) && VALID_STRING(clear_all_tabs))
mode.c_oflag &= ~OXTABS;
#endif /* OXTABS */
mode.c_lflag |= (ECHOE | ECHOK);