[Emacs-diffs] /srv/bzr/emacs/trunk r100981: * src/term.c: Remove dead code.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 100981
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Thu 2010-08-05 15:23:53 -0700
message:
  * src/term.c: Remove dead code.
modified:
  src/ChangeLog
  src/term.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-05 22:20:09 +0000
+++ b/src/ChangeLog     2010-08-05 22:23:53 +0000
@@ -1,5 +1,7 @@
 2010-08-05  Dan Nicolaescu  <address@hidden>
 
+       * 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),

=== modified file 'src/term.c'
--- a/src/term.c        2010-08-05 22:20:09 +0000
+++ b/src/term.c        2010-08-05 22:23:53 +0000
@@ -1119,7 +1119,6 @@
   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.  */
@@ -1127,7 +1126,6 @@
 int *char_ins_del_vector;
 
 #define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_COLS ((f))])
-#endif
 
 /* ARGSUSED */
 static void
@@ -1504,15 +1502,6 @@
 /***********************************************************************
                       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 *);