Index: src/frame.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/frame.c,v
retrieving revision 1.37.2.26
diff -u -r1.37.2.26 frame.c
--- src/frame.c 2000/03/02 13:20:42 1.37.2.26
+++ src/frame.c 2000/03/06 20:55:33
@@ -475,18 +475,6 @@
   Fset_frame_properties (frame, props);
   MAYBE_FRAMEMETH (f, init_frame_3, (f));
 
-  if (!DEVICE_STREAM_P (d))
-    {
-      /* Now initialise the gutters. This won't change the frame size,
-         but is needed as input to the layout that change_frame_size
-         will eventually do. Unfortunately gutter sizing code relies
-         on the frame in question being visible so we can't do this
-         earlier. */
-      init_frame_gutters (f);
-
-      change_frame_size (f, f->height, f->width, 0);
-    }
-
   /* Hallelujah, praise the lord. */
   f->init_finished = 1;
 
@@ -511,6 +499,18 @@
      to strange console-type-specific things that need to be done. */
   MAYBE_FRAMEMETH (f, after_init_frame, (f, first_frame_on_device,
 					 first_frame_on_console));
+
+  if (!DEVICE_STREAM_P (d))
+    {
+      /* Now initialise the gutters. This won't change the frame size,
+         but is needed as input to the layout that change_frame_size
+         will eventually do. Unfortunately gutter sizing code relies
+         on the frame in question being visible so we can't do this
+         earlier. */
+      init_frame_gutters (f);
+
+      change_frame_size (f, f->height, f->width, 0);
+    }
 
   if (first_frame_on_device)
     {
--- mem-limits.h~	Mon Feb 21 21:48:10 2000
+++ mem-limits.h	Mon Mar 06 19:40:37 2000
@@ -123,7 +123,7 @@
 /* Number of bytes of writable memory we can expect to be able to get */
 extern unsigned int lim_data;
 
-#ifdef HEAP_IN_DATA
+#if defined (HEAP_IN_DATA) && !defined(PDUMP)
 extern unsigned long static_heap_size;
 extern int initialized;
 static void
--- emacs.c~	Thu Mar 02 13:17:00 2000
+++ emacs.c	Mon Mar 06 19:39:06 2000
@@ -68,7 +68,7 @@
 /* For PATH_EXEC */
 #include <paths.h>
 
-#ifdef HEAP_IN_DATA
+#if defined (HEAP_IN_DATA) && !defined(PDUMP)
 void report_sheap_usage (int die_if_pure_storage_exceeded);
 #endif
 
@@ -2175,7 +2175,7 @@
   unbind_to (0, Qnil); /* this closes loadup.el */
   purify_flag = 0;
   run_temacs_argc = nargs + 1;
-#ifdef HEAP_IN_DATA
+#if defined (HEAP_IN_DATA) && !defined(PDUMP)
   report_sheap_usage (0);
 #endif
   LONGJMP (run_temacs_catch, 1);
@@ -2559,7 +2559,7 @@
   opurify = purify_flag;
   purify_flag = 0;
 
-#ifdef HEAP_IN_DATA
+#if defined (HEAP_IN_DATA) && !defined(PDUMP)
   report_sheap_usage (1);
 #endif
 
--- gmalloc.c~	Thu Feb 17 14:18:14 2000
+++ gmalloc.c	Mon Mar 06 19:39:20 2000
@@ -367,7 +367,7 @@
 #endif
 
 /* How to really get more memory.  */
-#ifdef HEAP_IN_DATA
+#if defined (HEAP_IN_DATA) && !defined(PDUMP)
 /* once dumped, free() & realloc() on static heap space will fail */
 #define PURE_DATA(x) \
 ((static_heap_dumped && (char*)x >= static_heap_base \
@@ -446,7 +446,7 @@
 static int
 initialize ()
 {
-#ifdef HEAP_IN_DATA
+#if defined (HEAP_IN_DATA) && !defined(PDUMP)
   if (static_heap_dumped && __morecore == more_static_core)
     {
       __morecore = __default_morecore;
--- nt.c~	Mon Feb 21 21:48:16 2000
+++ nt.c	Mon Mar 06 19:39:51 2000
@@ -615,7 +602,7 @@
       "EMACSLOCKDIR",
       "INFOPATH"
     };
-#ifdef HEAP_IN_DATA
+#if defined (HEAP_IN_DATA) && !defined(PDUMP)
     cache_system_info ();
 #endif
     for (i = 0; i < countof (env_vars); i++)