From: David Lawrence Ramsey Date: Sun, 25 Jun 2006 17:25:13 +0000 (+0000) Subject: fix #ifdefs X-Git-Tag: v1.3.12~1 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=1df1c9e4c02af11a1f36d4bce244050c5f630397;p=nano.git fix #ifdefs git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3679 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/src/nano.c b/src/nano.c index fbaa8918..178712e7 100644 --- a/src/nano.c +++ b/src/nano.c @@ -1256,15 +1256,18 @@ void enable_flow_control(void) * interpretation of the flow control characters too. */ void terminal_init(void) { - static struct termios newterm; - static bool newterm_set = FALSE; - +#ifdef USE_SLANG /* Slang curses emulation brain damage, part 2: Slang doesn't * implement nonl() or noecho() properly, so there's no way to * properly reinitialize the terminal using them. We have to save * the terminal state after the first call and restore it on * subsequent calls. */ + static struct termios newterm; + static bool newterm_set = FALSE; + if (!newterm_set) { +#endif + cbreak(); nonl(); noecho(); @@ -1273,10 +1276,12 @@ void terminal_init(void) if (!ISSET(PRESERVE)) disable_flow_control(); +#ifdef USE_SLANG tcgetattr(0, &newterm); newterm_set = TRUE; } else tcsetattr(0, TCSANOW, &newterm); +#endif } /* Read in a character, interpret it as a shortcut or toggle if