From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 4 Jan 2021 06:00:33 +0000 (-0500)
Subject: * src/print.c (print_vectorlike): Use `HASH_TABLE_SIZE`
X-Git-Tag: emacs-28.0.90~4400
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=90951f847c04d288121d5cb3b2e03639f060125c;p=emacs.git

* src/print.c (print_vectorlike): Use `HASH_TABLE_SIZE`
---

diff --git a/src/lisp.h b/src/lisp.h
index 0ad788cff84..5cc735be86c 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1478,8 +1478,8 @@ struct Lisp_String
   {
     struct
     {
-      ptrdiff_t size;
-      ptrdiff_t size_byte;
+      ptrdiff_t size;           /* MSB is used as the markbit.  */
+      ptrdiff_t size_byte;      /* Set to -1 for unibyte strings.  */
       INTERVAL intervals;	/* Text properties in this string.  */
       unsigned char *data;
     } s;
diff --git a/src/print.c b/src/print.c
index 94a8bcbf882..14af9195475 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1557,7 +1557,8 @@ print_vectorlike (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag,
 	/* Implement a readable output, e.g.:
 	  #s(hash-table size 2 test equal data (k1 v1 k2 v2)) */
 	/* Always print the size.  */
-	int len = sprintf (buf, "#s(hash-table size %"pD"d", ASIZE (h->next));
+	int len = sprintf (buf, "#s(hash-table size %"pD"d",
+                           HASH_TABLE_SIZE (h));
 	strout (buf, len, len, printcharfun);
 
 	if (!NILP (h->test.name))