[xemacs-hg @ 2002-04-03 10:47:37 by ben] fix tty problem et al internals/internals.texi: Add section on correctly merging a branch back into the trunk. console-tty.c, eval.c, event-unixoid.c, file-coding.c, file-coding.h, lisp.h, print.c, sysdep.c: Fix data corruption error in print.c from print_depth becoming negative. Borrow primitives internal_bind_int, internal_bind_lisp_object from my stderr-proc ws, soon to be integrated; use them to properly bind print_depth et al. First fix for TTY problem. The basic problem is I switched things so that the TTY I/O is filtered through a coding system, for the support of kterm and such, that speak JIS or similar encodings. (#### I ***swear*** I had this working way back in 19.12.) Anyway, this introduced buffering issues, in which instead of one char being read, it tried to read 1024 chars. I tried setting the stdin descriptor non-blocking, but it doesn't appear to work on Cygwin. (#### Andy, do you know anything about this?) So I fixed it elsewhere. If you get weirdness on the TTY, look in console-tty.c and see how it gets the coding system; maybe there's a way to change it (and if not, there should be!). Also fix warning in sysdep.c.

--- a/src/sysdep.c	Mon Apr 01 03:59:04 2002 +0000
+++ b/src/sysdep.c	Wed Apr 03 10:47:52 2002 +0000
@@ -2234,9 +2234,6 @@
 Bytecount
 total_data_usage (void)
 {
-  static EMACS_INT last_consing_since_gc;
-  static void *last_sbrk;
-
 #ifdef NEED_STARTS
   void *data_start = start_of_data ();
 #else
@@ -2246,6 +2243,9 @@
 #if !defined (WIN32_NATIVE) && !defined (CYGWIN)
   void *data_end;
 
+  static EMACS_INT last_consing_since_gc;
+  static void *last_sbrk;
+
   /* Random hack to avoid calling sbrk constantly (every funcall).  #### Is
      it worth it? */
   if (!last_sbrk || !(consing_since_gc >= last_consing_since_gc &&