Break cvs merge

2 files changed, 2 insertions, 16 deletions

diff --git a/contrib/texinfo/info/signals.c b/contrib/texinfo/info/signals.c
index e5a427cb657f..b93a585f5677 100644
--- a/contrib/texinfo/info/signals.c
+++ b/contrib/texinfo/info/signals.c
@@ -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:
       {
diff --git a/contrib/texinfo/info/terminal.c b/contrib/texinfo/info/terminal.c
index 8eb47c2cb78e..f0e43bebfae7 100644
--- a/contrib/texinfo/info/terminal.c
+++ b/contrib/texinfo/info/terminal.c
@@ -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 ();
 }
+