2 files changed, 9 insertions, 4 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index ec4d16aaabe..740359605fd 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,5 +1,10 @@
 2015-01-10  Paul Eggert  <eggert@cs.ucla.edu>
 
+        Port to 32-bit --with-wide-int
+        * make-docfile.c (write_globals): Define and use symbols like
+        iQnil (a small integer, like 0) rather than aQnil (an address
+        constant).
+
         Port to 32-bit Sun C 5.12 sparc
         * make-docfile.c (close_emacs_globals): Align lispsym to GCALIGNMENT.
         The alignment is required on all platforms; it just happens to have
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 7c5c4bcb865..bc5420ea939 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -613,7 +613,7 @@ compare_globals (const void *a, const void *b)
   if (ga->type != gb->type)
     return ga->type - gb->type;
 
-  /* Consider "nil" to be the least, so that aQnil is firat.  That
+  /* Consider "nil" to be the least, so that iQnil is zero.  That
      way, Qnil's internal representation is zero, which is a bit faster.  */
   if (ga->type == SYMBOL)
     {
@@ -701,9 +701,9 @@ write_globals (void)
         }
       else if (globals[i].type == SYMBOL)
         printf (("DEFINE_LISP_SYMBOL_BEGIN (%s)\n"
-                 "#define a%s (&lispsym[%d])\n"
-                 "#define %s make_lisp_symbol (a%s)\n"
-                 "DEFINE_LISP_SYMBOL_END (a%s)\n\n"),
+                 "#define i%s %d\n"
+                 "#define %s builtin_lisp_symbol (i%s)\n"
+                 "DEFINE_LISP_SYMBOL_END (%s)\n\n"),
                 globals[i].name, globals[i].name, symnum++,
                 globals[i].name, globals[i].name, globals[i].name);
       else