? src/ChangeLog.add
Index: src/alloc.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/alloc.c,v
retrieving revision 1.42.2.20
diff -u -r1.42.2.20 alloc.c
--- alloc.c	1999/10/01 16:36:44	1.42.2.20
+++ alloc.c	1999/10/02 00:42:50
@@ -2421,7 +2421,7 @@
 
 static int dumpstructidx;
 
-/* Put an entry in staticvec, pointing at the variable whose address is given
+/* Put an entry in dumpstructvec, pointing at the variable whose address is given
  */
 void
 dumpstruct (void *varaddress, const struct struct_description *desc)
@@ -2433,6 +2433,22 @@
   dumpstructidx++;
 }
 
+Lisp_Object *pdump_wirevec[200];
+static int pdump_wireidx;
+
+/* Put an entry in pdump_wirevec, pointing at the variable whose address is given
+ */
+void
+pdump_wire (Lisp_Object *varaddress)
+{
+  if (pdump_wireidx >= countof (pdump_wirevec))
+    /* #### This is now a dubious abort() since this routine may be called */
+    /* by Lisp attempting to load a DLL. */
+    abort ();
+  pdump_wirevec[pdump_wireidx++] = varaddress;
+}
+
+
 
 /* Mark reference to a Lisp_Object.  If the object referred to has not been
    seen yet, recursively mark all the references contained in it. */
@@ -3909,6 +3925,8 @@
 
   staticidx_nodump = 0;
   dumpstructidx = 0;
+  pdump_wireidx = 0;
+
   consing_since_gc = 0;
 #if 1
   gc_cons_threshold = 500000; /* XEmacs change */
@@ -4107,6 +4125,7 @@
  *			- nb_structdmp*pair(void *, adr) for pointers to structures
  *			- lrecord_implementations_table[]
  *			- relocation table
+ *                      - wired variable address/value couples with the count preceding the list
  */	
 typedef struct
 {
@@ -4718,19 +4737,20 @@
   pdump_entry_list_elmt *elmt;
   reloc_table rt;
 
-  for (i=0; i<256; i++) {
-    elmt = pdump_object_table[i].list;
-    if(!elmt)
-      continue;
-    rt.desc = lrecord_implementations_table[i]->description;
-    rt.count = pdump_object_table[i].count;
-    write (pdump_fd, &rt, sizeof (rt));
-    while (elmt)
-      {
-	EMACS_INT rdata = pdump_get_entry (XRECORD_LHEADER (elmt->obj))->save_offset;
-	write (pdump_fd, &rdata, sizeof (rdata));
-	elmt = elmt->next;
-      }
+  for (i=0; i<256; i++)
+    {
+      elmt = pdump_object_table[i].list;
+      if(!elmt)
+	continue;
+      rt.desc = lrecord_implementations_table[i]->description;
+      rt.count = pdump_object_table[i].count;
+      write (pdump_fd, &rt, sizeof (rt));
+      while (elmt)
+	{
+	  EMACS_INT rdata = pdump_get_entry (XRECORD_LHEADER (elmt->obj))->save_offset;
+	  write (pdump_fd, &rdata, sizeof (rdata));
+	  elmt = elmt->next;
+	}
   }
 
   for (i=0; i<pdump_struct_table.count; i++)
@@ -4751,6 +4771,22 @@
   write (pdump_fd, &rt, sizeof (rt));
 }
 
+static void
+pdump_dump_wired (void)
+{
+  EMACS_INT count = pdump_wireidx;
+  int i;
+
+  write (pdump_fd, &count, sizeof (count));
+
+  for (i=0; i<count; i++)
+    {
+      Lisp_Object obj = pdump_get_entry (XRECORD_LHEADER (*(pdump_wirevec[i])))->save_offset;
+      write (pdump_fd, &pdump_wirevec[i], sizeof (pdump_wirevec[i]));
+      write (pdump_fd, &obj, sizeof (obj));
+    }
+}
+
 void
 pdump (void)
 {
@@ -4787,6 +4823,8 @@
 
   for (i=0; i<staticidx; i++)
     pdump_register_object (*staticvec[i]);
+  for (i=0; i<pdump_wireidx; i++)
+    pdump_register_object (*pdump_wirevec[i]);
 
   none = 1;
   for(i=0;i<256;i++)
@@ -4829,6 +4867,7 @@
   pdump_dump_structvec ();
   pdump_dump_itable ();
   pdump_dump_rtables ();
+  pdump_dump_wired ();
 
   close (pdump_fd);
   free (pdump_buf);
@@ -4847,6 +4886,7 @@
   int i;
   char *p;
   EMACS_INT delta;
+  EMACS_INT count;
 
   pdump_reload = 0;
 
@@ -4921,9 +4961,25 @@
 	  p += sizeof (EMACS_INT);
 	}
     }
+
+  /* Put the pdump_wire variables in place */
+  count = *(EMACS_INT *)p;
+  p += sizeof(EMACS_INT);
+
+  for (i=0; i<count; i++)
+    {
+      Lisp_Object *var, obj;
+      var = *(Lisp_Object **)p;
+      p += sizeof (Lisp_Object *);
+
+      obj = *(Lisp_Object *)p;
+      p += sizeof (Lisp_Object);
+
+      if (obj && POINTER_TYPE_P (XGCTYPE (obj)))
+	obj += delta;
+      *var = obj;
+    }
 
-  /* Rewire Qnil */
-  Qnil = Vterminal_console;
   return 1;
 }
 
Index: src/elhash.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/elhash.c,v
retrieving revision 1.14.2.8
diff -u -r1.14.2.8 elhash.c
--- elhash.c	1999/09/03 04:47:09	1.14.2.8
+++ elhash.c	1999/10/02 00:42:50
@@ -1450,4 +1450,5 @@
 {
   /* This must NOT be staticpro'd */
   Vall_weak_hash_tables = Qnil;
+  pdump_wire (&Vall_weak_hash_tables);
 }
Index: src/glyphs-msw.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/glyphs-msw.c,v
retrieving revision 1.21.2.25
diff -u -r1.21.2.25 glyphs-msw.c
--- glyphs-msw.c	1999/10/01 16:36:49	1.21.2.25
+++ glyphs-msw.c	1999/10/02 00:42:51
@@ -2942,8 +2942,8 @@
 void
 reinit_image_instantiator_format_create_glyphs_mswindows (void)
 {
-  INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (bmp);
-  INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (mswindows_resource);
+  REINITIALIZE_IMAGE_INSTANTIATOR_FORMAT (bmp);
+  REINITIALIZE_IMAGE_INSTANTIATOR_FORMAT (mswindows_resource);
 }
 
 void
Index: src/lisp.h
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/lisp.h,v
retrieving revision 1.38.2.25
diff -u -r1.38.2.25 lisp.h
--- lisp.h	1999/10/01 16:36:51	1.38.2.25
+++ lisp.h	1999/10/02 00:42:51
@@ -1956,6 +1956,9 @@
 /* Call dumpstruct(&var, &desc) to dump the structure pointed to by `var'. */
 void dumpstruct (void *, const struct struct_description *);
 
+/* Call pdump_wire(&var) to ensure that var is properly updated after pdump. */
+void pdump_wire (Lisp_Object *);
+
 /* Nonzero means Emacs has already been initialized.
    Used during startup to detect startup of dumped Emacs.  */
 extern int initialized;
Index: src/symbols.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/symbols.c,v
retrieving revision 1.22.2.14
diff -u -r1.22.2.14 symbols.c
--- symbols.c	1999/10/01 16:36:55	1.22.2.14
+++ symbols.c	1999/10/02 00:42:52
@@ -3164,6 +3164,9 @@
   defsymbol (&Qt, "t");
   XSYMBOL (Qt)->value = Qt;	/* Veritas aetera */
   Vquit_flag = Qnil;
+
+  pdump_wire (&Qnil);
+  pdump_wire (&Qunbound);
 }
 
 void