Break cvs merge

This commit is contained in:
Mark Murray 1999-01-15 12:37:44 +00:00
parent 55b72e5b6a
commit d03c174754
2 changed files with 2 additions and 16 deletions

View File

@ -145,15 +145,6 @@ info_signal_handler (sig)
}
break;
#if defined (SIGWINCH) && defined(SIGCONT)
case SIGCONT:
if(old_CONT)
(void)(old_CONT)(sig);
/* pretend a SIGWINCH in case the terminal window size has changed
while we've been asleep */
/* FALLTROUGH */
#endif /* defined (SIGWINCH) && defined(SIGCONT) */
#if defined (SIGWINCH)
case SIGWINCH:
{

View File

@ -111,12 +111,6 @@ static char *term_invbeg;
/* The string to turn off inverse mode, if this term has one. */
static char *term_invend;
/* The string to turn on keypad transmit mode, if this term has one. */
static char *term_ks;
/* The string to turn off keypad transmit mode, if this term has one. */
static char *term_ke;
/* Although I can't find any documentation that says this is supposed to
return its argument, all the code I've looked at (termutils, less)
does so, so fine. */
@ -625,7 +619,7 @@ terminal_initialize_terminal (terminal_name)
term_mo = (char *)NULL;
}
/* Attempt to find the arrow keys. */
/* Attempt to find the arrow keys. */
term_ku = tgetstr ("ku", &buffer);
term_kd = tgetstr ("kd", &buffer);
term_kr = tgetstr ("kr", &buffer);
@ -840,3 +834,4 @@ terminal_unprep_terminal ()
#endif /* !HAVE_TERMIOS_H */
terminal_end_using_terminal ();
}