(print): When removing objects from Vprint_number_table,

only scan the newly added objects.
(print_preprocess): If OBJ is a gensym, and print-continuous-numbering,
unconditionally force it to stay in the table.

diff --git a/src/ChangeLog b/src/ChangeLog
index 920f22046c6d6e657355e3d7fe6a706a146023d1..fa10ff354d07d3bdd4dacc42edcc226f756fab42 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+1999-10-09  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
+
+       * print.c (print): When removing objects from Vprint_number_table,
+       only scan the newly added objects.
+       (print_preprocess): If OBJ is a gensym, and print-continuous-numbering,
+       unconditionally force it to stay in the table.
+
 1999-10-09  Gerd Moellmann  <gerd@gnu.org>
 
        * xfns.c (prepare_image_for_display): Don't try to load image if

diff --git a/src/print.c b/src/print.c
index d6c85717f016807a0a218d621dd93fe516a1d561..dc28ed0ce1117f11f0be532a65031a62772c33a9 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -1069,12 +1069,13 @@ print (obj, printcharfun, escapeflag)
   /* Construct Vprint_number_table for print-gensym and print-circle.  */
   if (!NILP (Vprint_gensym) || !NILP (Vprint_circle))
     {
-      int i, index = 0;
+      int i, start, index;
       /* Construct Vprint_number_table.  */
+      start = index = print_number_index;
       print_preprocess (obj);
       /* Remove unnecessary objects, which appear only once in OBJ;
         that is, whose status is Qnil.  */
-      for (i = 0; i < print_number_index; i++)
+      for (i = start; i < print_number_index; i++)
        if (!NILP (PRINT_NUMBER_STATUS (Vprint_number_table, i)))
          {
            PRINT_NUMBER_OBJECT (Vprint_number_table, index)
@@ -1138,6 +1139,12 @@ print_preprocess (obj)
            }
        }
       PRINT_NUMBER_OBJECT (Vprint_number_table, print_number_index) = obj;
+      /* If Vprint_continuous_numbering is non-nil and OBJ is a gensym,
+        always print the gensym with a number.  This is a special for
+        the lisp function byte-compile-output-docform.  */
+      if (! NILP (Vprint_continuous_numbering) && SYMBOLP (obj)
+         && NILP (XSYMBOL (obj)->obarray))
+       PRINT_NUMBER_STATUS (Vprint_number_table, print_number_index) = Qt;
       print_number_index++;
 
       switch (XGCTYPE (obj))