(Fget_char_property): Update call to overlays_at.

[gnu-emacs] / src / vm-limit.c

diff --git a/src/vm-limit.c b/src/vm-limit.c
index b23beeb26e7710f16ba97624cf0c9fd88ff6d2a3..721e740bd02858e2d1b3a94d6c0a05568403f2f1 100644 (file)
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -50,8 +50,12 @@ static void (*warn_function) ();
 static void
 check_memory_limits ()
 {
+#ifdef REL_ALLOC
+  extern POINTER (*real_morecore) ();
+#endif
   extern POINTER (*__morecore) ();
 
+
   register POINTER cp;
   unsigned long five_percent;
   unsigned long data_size;
@@ -61,6 +65,11 @@ check_memory_limits ()
   five_percent = lim_data / 20;
 
   /* Find current end of memory and issue warning if getting near max */
+#ifdef REL_ALLOC
+  if (real_morecore)
+    cp = (char *) (*real_morecore) (0);
+  else
+#endif
   cp = (char *) (*__morecore) (0);
   data_size = (char *) cp - (char *) data_space_start;
 
@@ -130,4 +139,9 @@ memory_warnings (start, warnfun)
 
   warn_function = warnfun;
   __after_morecore_hook = check_memory_limits;
+
+#ifdef WINDOWSNT
+  /* Force data limit to be recalculated on each run.  */
+  lim_data = 0;
+#endif
 }