[5685] term_kx removed

[Gavin D. Smith]

Revision: 5685
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5685
Author:   gavin
Date:     2014-06-28 17:26:15 +0000 (Sat, 28 Jun 2014)
Log Message:
-----------
term_kx removed

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/pcterm.c
    trunk/info/terminal.c
    trunk/info/terminal.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-06-28 17:02:12 UTC (rev 5684)
+++ trunk/ChangeLog     2014-06-28 17:26:15 UTC (rev 5685)
@@ -18,6 +18,11 @@
        between Escape being pressed and arrow keys.  Don't push unused key
        presses back into input buffer.
 
+       * info/terminal.c (term_kx): Remove unused variable (same as
+       term_kD).
+       * info/pcterm.c (pc_initialize_terminal): Use term_kD instead of
+       term_kx.
+
 2014-06-28  Gavin Smith  <address@hidden>
 
        * info/infokey.h:

Modified: trunk/info/pcterm.c
===================================================================
--- trunk/info/pcterm.c 2014-06-28 17:02:12 UTC (rev 5684)
+++ trunk/info/pcterm.c 2014-06-28 17:26:15 UTC (rev 5685)
@@ -883,7 +883,7 @@
   term_kh = (char *)find_sequence (K_Home);
   term_ke = (char *)find_sequence (K_End);
   term_ki = (char *)find_sequence (K_Insert);
-  term_kx = (char *)find_sequence (K_Delete);
+  term_kD = (char *)find_sequence (K_Delete);
 #endif /* __MSDOS__ */
 
   /* Set all the hooks to our PC-specific functions.  */

Modified: trunk/info/terminal.c
===================================================================
--- trunk/info/terminal.c       2014-06-28 17:02:12 UTC (rev 5684)
+++ trunk/info/terminal.c       2014-06-28 17:26:15 UTC (rev 5685)
@@ -223,7 +223,6 @@
 char *term_ke = NULL;  /* end */
 char *term_kD = NULL;  /* delete */
 char *term_ki = NULL;  /* ins */
-char *term_kx = NULL;  /* del */
 char *term_bt = NULL;  /* back tab */
 
 /* Move the cursor to the terminal location of X and Y. */
@@ -714,13 +713,12 @@
   term_kh = tgetstr ("kh", &buffer);
   term_ke = tgetstr ("@7", &buffer);
   term_ki = tgetstr ("kI", &buffer);
-  term_kx = tgetstr ("kD", &buffer);
+  term_kD = tgetstr ("kD", &buffer);
 
   /* Home and end keys. */
   term_kh = tgetstr ("kh", &buffer);
   term_ke = tgetstr ("@7", &buffer);
 
-  term_kD = tgetstr ("kD", &buffer);
   term_bt = tgetstr ("bt", &buffer);
 
   initialize_byte_map ();

Modified: trunk/info/terminal.h
===================================================================
--- trunk/info/terminal.h       2014-06-28 17:02:12 UTC (rev 5684)
+++ trunk/info/terminal.h       2014-06-28 17:26:15 UTC (rev 5685)
@@ -123,8 +123,7 @@
 extern char *term_ku, *term_kd, *term_kr, *term_kl;
 extern char *term_kP, *term_kN;
 extern char *term_ke, *term_kh;
-extern char *term_kx, *term_ki;
-extern char *term_kD;
+extern char *term_kD, *term_ki;
 extern char *term_bt;
 
 #endif /* !TERMINAL_H */