* src/term.c: Remove dead code.

diff --git a/src/ChangeLog b/src/ChangeLog
index 575c93566aef78406f24f2c654956aba03a56123..59800035b8039d81f39369ccd2a5ba137648188a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2010-08-05  Dan Nicolaescu  <dann@ics.uci.edu>
 
 2010-08-05  Dan Nicolaescu  <dann@ics.uci.edu>
 

+       * term.c: Remove dead code.
+

        Fix emacs -Q -f server-start & emacsclient -t on GNU/Linux.
        * term.c (dissociate_if_controlling_tty): Use USG5 instead of
        USG.  This is equivalent to defined (USG) && !defined (BSD_PGRPS),
        Fix emacs -Q -f server-start & emacsclient -t on GNU/Linux.
        * term.c (dissociate_if_controlling_tty): Use USG5 instead of
        USG.  This is equivalent to defined (USG) && !defined (BSD_PGRPS),

diff --git a/src/term.c b/src/term.c
index f41aacb274254ece72ce614175fbda269367e861..5fdc4caeb2ff8ddee6de86fbe371170133878be7 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -1119,7 +1119,6 @@ per_line_cost (char *str)
   return cost;
 }
 
   return cost;
 }
 

-#ifndef old

 /* char_ins_del_cost[n] is cost of inserting N characters.
    char_ins_del_cost[-n] is cost of deleting N characters.
    The length of this vector is based on max_frame_cols.  */
 /* char_ins_del_cost[n] is cost of inserting N characters.
    char_ins_del_cost[-n] is cost of deleting N characters.
    The length of this vector is based on max_frame_cols.  */


@@ -1127,7 +1126,6 @@ per_line_cost (char *str)
 int *char_ins_del_vector;
 
 #define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_COLS ((f))])
 int *char_ins_del_vector;
 
 #define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_COLS ((f))])

-#endif

 
 /* ARGSUSED */
 static void
 
 /* ARGSUSED */
 static void


@@ -1504,15 +1502,6 @@ term_get_fkeys_1 (void)
 /***********************************************************************
                       Character Display Information
  ***********************************************************************/
 /***********************************************************************
                       Character Display Information
  ***********************************************************************/

-
-/* Avoid name clash with functions defined in xterm.c */
-#ifdef static
-#define append_glyph append_glyph_term
-#define produce_stretch_glyph produce_stretch_glyph_term
-#define append_composite_glyph append_composite_glyph_term
-#define produce_composite_glyph produce_composite_glyph_term
-#endif
-

 static void append_glyph (struct it *);
 static void produce_stretch_glyph (struct it *);
 static void append_composite_glyph (struct it *);
 static void append_glyph (struct it *);
 static void produce_stretch_glyph (struct it *);
 static void append_composite_glyph (struct it *);