[Emacs-diffs] Changes to emacs/src/xdisp.c

[YAMAMOTO Mitsuharu]

Index: emacs/src/xdisp.c
diff -u emacs/src/xdisp.c:1.1101 emacs/src/xdisp.c:1.1102
--- emacs/src/xdisp.c:1.1101    Sun May 28 20:19:07 2006
+++ emacs/src/xdisp.c   Fri Jun  2 09:39:43 2006
@@ -6238,6 +6238,8 @@
   it->position = (STRINGP (it->string)
                  ? it->current.string_pos
                  : it->current.pos);
+  if (STRINGP (it->string))
+    it->object = it->string;
   return 1;
 }
 
@@ -11777,7 +11779,7 @@
 
       /* If we reached the end of the line, and end was from a string,
         cursor is not on this line.  */
-      if (glyph == end)
+      if (glyph == end && row->continued_p)
        return 0;
     }
 
@@ -14961,6 +14963,25 @@
               glyph->left_box_line_p,
               glyph->right_box_line_p);
     }
+  else if (glyph->type == COMPOSITE_GLYPH)
+    {
+      fprintf (stderr,
+              "  %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n",
+              glyph - row->glyphs[TEXT_AREA],
+              '+',
+              glyph->charpos,
+              (BUFFERP (glyph->object)
+               ? 'B'
+               : (STRINGP (glyph->object)
+                  ? 'S'
+                  : '-')),
+              glyph->pixel_width,
+              glyph->u.cmp_id,
+              '.',
+              glyph->face_id,
+              glyph->left_box_line_p,
+              glyph->right_box_line_p);
+    }
 }