merge trunk

1 files changed, 11 insertions, 3 deletions

diff --git a/src/print.c b/src/print.c
index 9050a0cb773..2f52f5d03ec 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1968,7 +1968,7 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag)
                  Otherwise we'll make a line extremely long, which
                  results in slow redisplay.  */
               if (SUB_CHAR_TABLE_P (obj)
-                  && XINT (XSUB_CHAR_TABLE (obj)->depth) == 3)
+                  && XSUB_CHAR_TABLE (obj)->depth == 3)
                 PRINTCHAR ('\n');
               PRINTCHAR ('#');
               PRINTCHAR ('^');
@@ -1981,16 +1981,24 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag)
 
           PRINTCHAR ('[');
           {
-            register int i;
+            int i, idx = SUB_CHAR_TABLE_P (obj) ? SUB_CHAR_TABLE_OFFSET : 0;
             register Lisp_Object tem;
             ptrdiff_t real_size = size;
 
+            /* For a sub char-table, print heading non-Lisp data first.  */
+            if (SUB_CHAR_TABLE_P (obj))
+              {
+                i = sprintf (buf, "%d %d", XSUB_CHAR_TABLE (obj)->depth,
+                             XSUB_CHAR_TABLE (obj)->min_char);
+                strout (buf, i, i, printcharfun);
+              }
+
             /* Don't print more elements than the specified maximum.  */
             if (NATNUMP (Vprint_length)
                 && XFASTINT (Vprint_length) < size)
               size = XFASTINT (Vprint_length);
 
-            for (i = 0; i < size; i++)
+            for (i = idx; i < size; i++)
               {
                 if (i) PRINTCHAR (' ');
                 tem = AREF (obj, i);