Module Name: src
Committed By: christos
Date: Tue Dec 8 12:57:16 UTC 2015
Modified Files:
src/lib/libedit: tty.c
Log Message:
If we did not setup the tty, don't reset it.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/lib/libedit/tty.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/tty.c
diff -u src/lib/libedit/tty.c:1.47 src/lib/libedit/tty.c:1.48
--- src/lib/libedit/tty.c:1.47 Thu May 14 06:44:15 2015
+++ src/lib/libedit/tty.c Tue Dec 8 07:57:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.47 2015/05/14 10:44:15 christos Exp $ */
+/* $NetBSD: tty.c,v 1.48 2015/12/08 12:57:16 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: tty.c,v 1.47 2015/05/14 10:44:15 christos Exp $");
+__RCSID("$NetBSD: tty.c,v 1.48 2015/12/08 12:57:16 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -580,6 +580,9 @@ protected void
/*ARGSUSED*/
tty_end(EditLine *el)
{
+ if (el->el_flags & EDIT_DISABLED)
+ return 0;
+
if (tty_setty(el, TCSAFLUSH, &el->el_tty.t_or) == -1) {
#ifdef DEBUG_TTY
(void) fprintf(el->el_errfile,
