aboutsummaryrefslogtreecommitdiff
path: root/el.c
diff options
context:
space:
mode:
authorPedro F. Giffuni <pfg@FreeBSD.org>2016-02-07 01:38:50 +0000
committerPedro F. Giffuni <pfg@FreeBSD.org>2016-02-07 01:38:50 +0000
commitc729c39672cd6bc2e7f57dccc8aab4eb761f0ba6 (patch)
treea142d083d50d23398f35db049fff87cb80bef6d5 /el.c
parent5b6fd65dbfcb7ec622b234a3a55d028c0028f24f (diff)
downloadsrc-c729c39672cd6bc2e7f57dccc8aab4eb761f0ba6.tar.gz
src-c729c39672cd6bc2e7f57dccc8aab4eb761f0ba6.zip
Import libedit 2016-01-16vendor/NetBSD/libedit/2016-01-30
Obtained from: NetBSD
Notes
Notes: svn path=/vendor/NetBSD/libedit/dist/; revision=295360 svn path=/vendor/NetBSD/libedit/2016-01-16/; revision=295361; tag=vendor/NetBSD/libedit/2016-01-30
Diffstat (limited to 'el.c')
-rw-r--r--el.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/el.c b/el.c
index 864193d59719..8e1b3b5701fa 100644
--- a/el.c
+++ b/el.c
@@ -1,4 +1,4 @@
-/* $NetBSD: el.c,v 1.73 2014/06/18 18:12:28 christos Exp $ */
+/* $NetBSD: el.c,v 1.74 2015/12/08 12:56:55 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)el.c 8.2 (Berkeley) 1/3/94";
#else
-__RCSID("$NetBSD: el.c,v 1.73 2014/06/18 18:12:28 christos Exp $");
+__RCSID("$NetBSD: el.c,v 1.74 2015/12/08 12:56:55 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -135,7 +135,8 @@ el_end(EditLine *el)
terminal_end(el);
keymacro_end(el);
map_end(el);
- tty_end(el);
+ if (!(el->el_flags & NO_TTY))
+ tty_end(el);
ch_end(el);
search_end(el);
hist_end(el);