Merged in changes from CVS trunk.

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

diff --git a/src/terminfo.c b/src/terminfo.c
index 8ce8796..52acc5b 100644 (file)
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -18,14 +18,14 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#include <config.h>
+#include "lisp.h"
+
 /* Define these variables that serve as global parameters to termcap,
    so that we do not need to conditionalize the places in Emacs
    that set them.  */
 
 char *UP, *BC, PC;
-short ospeed;
-
-static buffer[512];
 
 /* Interface to curses/terminfo library.
    Turns out that all of the terminfo-level routines look
@@ -38,14 +38,17 @@ char *
 tparam (string, outstring, len, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
      char *string;
      char *outstring;
-     int arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9;
+     int len, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9;
 {
   char *temp;
   extern char *tparm();
 
   temp = tparm (string, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
   if (outstring == 0)
-    outstring = ((char *) (malloc ((strlen (temp)) + 1)));
+    outstring = ((char *) (xmalloc ((strlen (temp)) + 1)));
   strcpy (outstring, temp);
   return outstring;
 }
+
+/* arch-tag: a6f96a69-e68f-4e9d-a223-f0b0da26ead5
+   (do not change this comment) */