(read-abbrev-file): Don't set save-abbrevs.

[bpt/emacs.git] / src / termcap.c

diff --git a/src/termcap.c b/src/termcap.c
index f802704..b99ae47 100644 (file)
--- a/src/termcap.c
+++ b/src/termcap.c
@@ -1,5 +1,6 @@
 /* Work-alike for termcap, plus extra features.
-   Copyright (C) 1985, 86, 93, 94, 95, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1985, 86, 93, 94, 95, 2000, 2001
+   Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -292,6 +293,8 @@ tgetst1 (ptr, area)
 int tputs_baud_rate;
 char PC;
 
+#if 0 /* Doesn't seem to be used anymore.  */
+
 /* Actual baud rate if positive;
    - baud rate / 100 if negative.  */
 
@@ -306,6 +309,8 @@ static int speeds[] =
 #endif /* not VMS */
   };
 
+#endif /* 0  */
+
 void
 tputs (str, nlines, outfun)
      register char *str;
@@ -555,11 +560,11 @@ tgetent (bp, name)
       /* If BP is malloc'd by us, make sure it is big enough.  */
       if (malloc_size)
        {
-         malloc_size = bp1 - bp + buf.size;
-         termcap_name = (char *) xrealloc (bp, malloc_size);
-         bp1 += termcap_name - bp;
-         tc_search_point += termcap_name - bp;
-         bp = termcap_name;
+         int offset1 = bp1 - bp, offset2 = tc_search_point - bp;
+         malloc_size = offset1 + buf.size;
+         bp = termcap_name = (char *) xrealloc (bp, malloc_size);
+         bp1 = termcap_name + offset1;
+         tc_search_point = termcap_name + offset2;
        }
 
       /* Copy the line of the entry from buf into bp.  */