summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2016-08-16 23:13:05 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2016-08-16 23:15:17 +0200
commit83a2cf3e36a20b7740a2902d2ef4996df7a46270 (patch)
tree18896cd8f453aa358563a74af9b6c4b0b5b6fa83
parent02f5c0208985d60fede08c1eafad04e80353b670 (diff)
Drop OTILDE support
It was used long ago, poses problems to readline, and currently conflicts with TAB1 Thanks Kalle Olavi Niemitalo for the report and rationale * term/munge.c (output_character): Do not handle OTILDE. (output_width): Likewise. * term/term.h (OTILDE): Drop macro definition. * term/users.c (open_hook): Do not check OTILDE flag.
-rw-r--r--term/munge.c7
-rw-r--r--term/term.h1
-rw-r--r--term/users.c3
3 files changed, 0 insertions, 11 deletions
diff --git a/term/munge.c b/term/munge.c
index 7e08e2d2..96b0df39 100644
--- a/term/munge.c
+++ b/term/munge.c
@@ -87,11 +87,6 @@ output_character (int c)
}
else if ((oflag & ONOEOT) && c == CHAR_EOT)
;
- else if ((oflag & OTILDE) && c == '~')
- {
- poutput ('\\');
- poutput ('`');
- }
else if ((oflag & OLCASE) && isalpha (c))
{
if (isupper (c))
@@ -125,8 +120,6 @@ output_width (int c, int loc)
if (oflag & OPOST)
{
- if ((oflag & OTILDE) && c == '~')
- return 2;
if ((oflag & OLCASE) && isalpha (c) && isupper (c))
return 2;
}
diff --git a/term/term.h b/term/term.h
index 3067425c..0a428691 100644
--- a/term/term.h
+++ b/term/term.h
@@ -65,7 +65,6 @@
#else
#define OLCASE (1 << 9)
#endif
-#define OTILDE (1 << 10)
/* used in mdmctl device call */
#define MDMCTL_BIS 0
diff --git a/term/users.c b/term/users.c
index 8151dc70..193b3582 100644
--- a/term/users.c
+++ b/term/users.c
@@ -183,9 +183,6 @@ open_hook (struct trivfs_control *cntl,
open_count++; /* XXX debugging */
- /* XXX debugging */
- assert (! (termstate.c_oflag & OTILDE));
-
/* Assert DTR if necessary. */
if (termflags & NO_CARRIER)
{