3 files changed, 139 insertions, 90 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8fc876e248c..3b0b295e695 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,21 @@
+2013-01-06  Chong Yidong  <cyd@gnu.org>
+
+        * keyboard.c (echo_add_char): New function, factored out from
+        echo_char.  Don't add a space if the previous echo string was
+        empty (Bug#13255).
+        (echo_char): Use it.
+        (read_key_sequence): When echoing mock input, ensure that the
+        trailing dash is properly added.
+
+2013-01-05  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (dump_glyph): Align glyph data better.  Use "pD" instead
+        of a non-portable "t" to print ptrdiff_t values.  Allow up to 9
+        digits for buffer positions, before misalignment starts.  Display
+        "0" for integer "object" field.
+        (dump_glyph_row): Adapt the header line to changes in dump_glyph.
+        Display the newline glyph more unambiguously.
+
 2013-01-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * nsterm.m (ns_draw_underwave):
diff --git a/src/keyboard.c b/src/keyboard.c
index e11ed20d2a0..69463f45034 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -500,97 +500,103 @@ kset_system_key_syms (struct kboard *kb, Lisp_Object val)
 }
 
 
-/* Add C to the echo string, if echoing is going on.
-   C can be a character, which is printed prettily ("M-C-x" and all that
-   jazz), or a symbol, whose name is printed.  */
+/* Add C to the echo string, without echoing it immediately.  C can be
+   a character, which is pretty-printed, or a symbol, whose name is
+   printed.  */
 
 static void
-echo_char (Lisp_Object c)
+echo_add_char (Lisp_Object c)
 {
-  if (current_kboard->immediate_echo)
-    {
-      int size = KEY_DESCRIPTION_SIZE + 100;
-      char *buffer = alloca (size);
-      char *ptr = buffer;
-      Lisp_Object echo_string;
+  int size = KEY_DESCRIPTION_SIZE + 100;
+  char *buffer = alloca (size);
+  char *ptr = buffer;
+  Lisp_Object echo_string;
 
-      echo_string = KVAR (current_kboard, echo_string);
+  echo_string = KVAR (current_kboard, echo_string);
 
-      /* If someone has passed us a composite event, use its head symbol.  */
-      c = EVENT_HEAD (c);
+  /* If someone has passed us a composite event, use its head symbol.  */
+  c = EVENT_HEAD (c);
 
-      if (INTEGERP (c))
+  if (INTEGERP (c))
+    ptr = push_key_description (XINT (c), ptr);
+  else if (SYMBOLP (c))
+    {
+      Lisp_Object name = SYMBOL_NAME (c);
+      int nbytes = SBYTES (name);
+
+      if (size - (ptr - buffer) < nbytes)
         {
-          ptr = push_key_description (XINT (c), ptr);
+          int offset = ptr - buffer;
+          size = max (2 * size, size + nbytes);
+          buffer = alloca (size);
+          ptr = buffer + offset;
         }
-      else if (SYMBOLP (c))
-        {
-          Lisp_Object name = SYMBOL_NAME (c);
-          int nbytes = SBYTES (name);
 
-          if (size - (ptr - buffer) < nbytes)
-            {
-              int offset = ptr - buffer;
-              size = max (2 * size, size + nbytes);
-              buffer = alloca (size);
-              ptr = buffer + offset;
-            }
+      ptr += copy_text (SDATA (name), (unsigned char *) ptr, nbytes,
+                        STRING_MULTIBYTE (name), 1);
+    }
 
-          ptr += copy_text (SDATA (name), (unsigned char *) ptr, nbytes,
-                            STRING_MULTIBYTE (name), 1);
-        }
+  if ((NILP (echo_string) || SCHARS (echo_string) == 0)
+      && help_char_p (c))
+    {
+      const char *text = " (Type ? for further options)";
+      int len = strlen (text);
 
-      if ((NILP (echo_string) || SCHARS (echo_string) == 0)
-          && help_char_p (c))
+      if (size - (ptr - buffer) < len)
         {
-          const char *text = " (Type ? for further options)";
-          int len = strlen (text);
-
-          if (size - (ptr - buffer) < len)
-            {
-              int offset = ptr - buffer;
-              size += len;
-              buffer = alloca (size);
-              ptr = buffer + offset;
-            }
-
-          memcpy (ptr, text, len);
-          ptr += len;
+          int offset = ptr - buffer;
+          size += len;
+          buffer = alloca (size);
+          ptr = buffer + offset;
         }
 
-      /* Replace a dash from echo_dash with a space, otherwise
-         add a space at the end as a separator between keys.  */
-      if (STRINGP (echo_string)
-          && SCHARS (echo_string) > 1)
-        {
-          Lisp_Object last_char, prev_char, idx;
+      memcpy (ptr, text, len);
+      ptr += len;
+    }
 
-          idx = make_number (SCHARS (echo_string) - 2);
-          prev_char = Faref (echo_string, idx);
+  /* Replace a dash from echo_dash with a space, otherwise add a space
+     at the end as a separator between keys.  */
+  if (STRINGP (echo_string) && SCHARS (echo_string) > 1)
+    {
+      Lisp_Object last_char, prev_char, idx;
 
-          idx = make_number (SCHARS (echo_string) - 1);
-          last_char = Faref (echo_string, idx);
+      idx = make_number (SCHARS (echo_string) - 2);
+      prev_char = Faref (echo_string, idx);
 
-          /* We test PREV_CHAR to make sure this isn't the echoing
-             of a minus-sign.  */
-          if (XINT (last_char) == '-' && XINT (prev_char) != ' ')
-            Faset (echo_string, idx, make_number (' '));
-          else
-            echo_string = concat2 (echo_string, build_string (" "));
-        }
-      else if (STRINGP (echo_string))
+      idx = make_number (SCHARS (echo_string) - 1);
+      last_char = Faref (echo_string, idx);
+
+      /* We test PREV_CHAR to make sure this isn't the echoing of a
+         minus-sign.  */
+      if (XINT (last_char) == '-' && XINT (prev_char) != ' ')
+        Faset (echo_string, idx, make_number (' '));
+      else
         echo_string = concat2 (echo_string, build_string (" "));
+    }
+  else if (STRINGP (echo_string) && SCHARS (echo_string) > 0)
+    echo_string = concat2 (echo_string, build_string (" "));
 
-      kset_echo_string
-        (current_kboard,
-         concat2 (echo_string, make_string (buffer, ptr - buffer)));
+  kset_echo_string
+    (current_kboard,
+     concat2 (echo_string, make_string (buffer, ptr - buffer)));
+}
+
+/* Add C to the echo string, if echoing is going on.  C can be a
+   character or a symbol.  */
 
+static void
+echo_char (Lisp_Object c)
+{
+  if (current_kboard->immediate_echo)
+    {
+      echo_add_char (c);
       echo_now ();
     }
 }
 
 /* Temporarily add a dash to the end of the echo string if it's not
-   empty, so that it serves as a mini-prompt for the very next character.  */
+   empty, so that it serves as a mini-prompt for the very next
+   character.  */
 
 static void
 echo_dash (void)
@@ -9237,8 +9243,12 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
           key = keybuf[t];
           add_command_key (key);
           if ((FLOATP (Vecho_keystrokes) || INTEGERP (Vecho_keystrokes))
-              && NILP (Fzerop (Vecho_keystrokes)))
-            echo_char (key);
+              && NILP (Fzerop (Vecho_keystrokes))
+              && current_kboard->immediate_echo)
+            {
+              echo_add_char (key);
+              echo_dash ();
+            }
         }
 
       /* If not, we should actually read a character.  */
diff --git a/src/xdisp.c b/src/xdisp.c
index c9096339fcc..880e25334d1 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18007,18 +18007,23 @@ dump_glyph_matrix (struct glyph_matrix *matrix, int glyphs)
 void
 dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
 {
-  if (glyph->type == CHAR_GLYPH)
+  if (glyph->type == CHAR_GLYPH
+      || glyph->type == GLYPHLESS_GLYPH)
     {
       fprintf (stderr,
-               "  %5td %4c %6"pI"d %c %3d 0x%05x %c %4d %1.1d%1.1d\n",
+               "  %5"pD"d     %c %9"pI"d   %c %3d 0x%06x      %c %4d %1.1d%1.1d\n",
                glyph - row->glyphs[TEXT_AREA],
-               'C',
+               (glyph->type == CHAR_GLYPH
+                ? 'C'
+                : 'G'),
                glyph->charpos,
                (BUFFERP (glyph->object)
                 ? 'B'
                 : (STRINGP (glyph->object)
                    ? 'S'
-                   : '-')),
+                   : (INTEGERP (glyph->object)
+                      ? '0'
+                      : '-'))),
                glyph->pixel_width,
                glyph->u.ch,
                (glyph->u.ch < 0x80 && glyph->u.ch >= ' '
@@ -18031,7 +18036,7 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
   else if (glyph->type == STRETCH_GLYPH)
     {
       fprintf (stderr,
-               "  %5td %4c %6"pI"d %c %3d 0x%05x %c %4d %1.1d%1.1d\n",
+               "  %5"pD"d     %c %9"pI"d   %c %3d 0x%06x      %c %4d %1.1d%1.1d\n",
                glyph - row->glyphs[TEXT_AREA],
                'S',
                glyph->charpos,
@@ -18039,10 +18044,12 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
                 ? 'B'
                 : (STRINGP (glyph->object)
                    ? 'S'
-                   : '-')),
+                   : (INTEGERP (glyph->object)
+                      ? '0'
+                      : '-'))),
                glyph->pixel_width,
                0,
-               '.',
+               ' ',
                glyph->face_id,
                glyph->left_box_line_p,
                glyph->right_box_line_p);
@@ -18050,7 +18057,7 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
   else if (glyph->type == IMAGE_GLYPH)
     {
       fprintf (stderr,
-               "  %5td %4c %6"pI"d %c %3d 0x%05x %c %4d %1.1d%1.1d\n",
+               "  %5"pD"d     %c %9"pI"d   %c %3d 0x%06x      %c %4d %1.1d%1.1d\n",
                glyph - row->glyphs[TEXT_AREA],
                'I',
                glyph->charpos,
@@ -18058,7 +18065,9 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
                 ? 'B'
                 : (STRINGP (glyph->object)
                    ? 'S'
-                   : '-')),
+                   : (INTEGERP (glyph->object)
+                      ? '0'
+                      : '-'))),
                glyph->pixel_width,
                glyph->u.img_id,
                '.',
@@ -18069,7 +18078,7 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
   else if (glyph->type == COMPOSITE_GLYPH)
     {
       fprintf (stderr,
-               "  %5td %4c %6"pI"d %c %3d 0x%05x",
+               "  %5"pD"d     %c %9"pI"d   %c %3d 0x%06x",
                glyph - row->glyphs[TEXT_AREA],
                '+',
                glyph->charpos,
@@ -18077,7 +18086,9 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
                 ? 'B'
                 : (STRINGP (glyph->object)
                    ? 'S'
-                   : '-')),
+                   : (INTEGERP (glyph->object)
+                      ? '0'
+                      : '-'))),
                glyph->pixel_width,
                glyph->u.cmp.id);
       if (glyph->u.cmp.automatic)
@@ -18125,10 +18136,10 @@ dump_glyph_row (struct glyph_row *row, int vpos, int glyphs)
 {
   if (glyphs != 1)
     {
-      fprintf (stderr, "Row Start   End Used oE><\\CTZFesm     X    Y    W    H    V    A    P\n");
-      fprintf (stderr, "======================================================================\n");
+      fprintf (stderr, "Row     Start       End Used oE><\\CTZFesm     X    Y    W    H    V    A    P\n");
+      fprintf (stderr, "==============================================================================\n");
 
-      fprintf (stderr, "%3d %5"pI"d %5"pI"d %4d %1.1d%1.1d%1.1d%1.1d\
+      fprintf (stderr, "%3d %9"pI"d %9"pI"d %4d %1.1d%1.1d%1.1d%1.1d\
 %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d  %4d %4d %4d %4d %4d %4d %4d\n",
                vpos,
                MATRIX_ROW_START_CHARPOS (row),
@@ -18153,13 +18164,14 @@ dump_glyph_row (struct glyph_row *row, int vpos, int glyphs)
                row->visible_height,
                row->ascent,
                row->phys_ascent);
-      fprintf (stderr, "%9"pD"d %5"pD"d\t%5d\n", row->start.overlay_string_index,
+      /* The next 3 lines should align to "Start" in the header.  */
+      fprintf (stderr, "    %9"pD"d %9"pD"d\t%5d\n", row->start.overlay_string_index,
                row->end.overlay_string_index,
                row->continuation_lines_width);
-      fprintf (stderr, "%9"pI"d %5"pI"d\n",
+      fprintf (stderr, "    %9"pI"d %9"pI"d\n",
                CHARPOS (row->start.string_pos),
                CHARPOS (row->end.string_pos));
-      fprintf (stderr, "%9d %5d\n", row->start.dpvec_index,
+      fprintf (stderr, "    %9d %9d\n", row->start.dpvec_index,
                row->end.dpvec_index);
     }
 
@@ -18177,7 +18189,7 @@ dump_glyph_row (struct glyph_row *row, int vpos, int glyphs)
             ++glyph_end;
 
           if (glyph < glyph_end)
-            fprintf (stderr, "  Glyph    Type Pos   O W    Code C Face LR\n");
+            fprintf (stderr, " Glyph#  Type       Pos   O   W     Code      C Face LR\n");
 
           for (; glyph < glyph_end; ++glyph)
             dump_glyph (row, glyph, area);
@@ -18189,15 +18201,24 @@ dump_glyph_row (struct glyph_row *row, int vpos, int glyphs)
 
       for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
         {
-          char *s = alloca (row->used[area] + 1);
+          char *s = alloca (row->used[area] + 4);
           int i;
 
           for (i = 0; i < row->used[area]; ++i)
             {
               struct glyph *glyph = row->glyphs[area] + i;
-              if (glyph->type == CHAR_GLYPH
-                  && glyph->u.ch < 0x80
-                  && glyph->u.ch >= ' ')
+              if (i == row->used[area] - 1
+                  && area == TEXT_AREA
+                  && INTEGERP (glyph->object)
+                  && glyph->type == CHAR_GLYPH
+                  && glyph->u.ch == ' ')
+                {
+                  strcpy (&s[i], "[\\n]");
+                  i += 4;
+                }
+              else if (glyph->type == CHAR_GLYPH
+                       && glyph->u.ch < 0x80
+                       && glyph->u.ch >= ' ')
                 s[i] = glyph->u.ch;
               else
                 s[i] = '.';