[Emacs-diffs] /srv/bzr/emacs/trunk r105787: Add comments about special meaning of TAB characters in compositions.

[Eli Zaretskii]

------------------------------------------------------------
revno: 105787
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2011-09-15 19:22:58 +0300
message:
  Add comments about special meaning of TAB characters in compositions.
  
   src/xterm.c (x_draw_composite_glyph_string_foreground):
   src/w32term.c (x_draw_composite_glyph_string_foreground):
   src/term.c (encode_terminal_code):
   src/composite.c (composition_update_it, get_composition_id):
   src/xdisp.c (get_next_display_element)
   (fill_composite_glyph_string): Add comments about special meaning
   of TAB characters in a composition.
modified:
  src/ChangeLog
  src/composite.c
  src/term.c
  src/w32term.c
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-09-15 16:10:37 +0000
+++ b/src/ChangeLog     2011-09-15 16:22:58 +0000
@@ -1,3 +1,13 @@
+2011-09-15  Eli Zaretskii  <address@hidden>
+
+       * xterm.c (x_draw_composite_glyph_string_foreground):
+       * w32term.c (x_draw_composite_glyph_string_foreground):
+       * term.c (encode_terminal_code):
+       * composite.c (composition_update_it, get_composition_id):
+       * xdisp.c (get_next_display_element)
+       (fill_composite_glyph_string): Add comments about special meaning
+       of TAB characters in a composition.
+
 2011-09-15  Paul Eggert  <address@hidden>
 
        * editfns.c (Fformat): Fix off-by-1 bug for "%%b" (Bug#9514).

=== modified file 'src/composite.c'
--- a/src/composite.c   2011-08-14 06:40:45 +0000
+++ b/src/composite.c   2011-09-15 16:22:58 +0000
@@ -345,6 +345,8 @@
        {
          int this_width;
          ch = XINT (key_contents[i]);
+         /* TAB in a composition means display glyphs with padding
+            space on the left or right.  */
          this_width = (ch == '\t' ? 1 : CHAR_WIDTH (ch));
          if (cmp->width < this_width)
            cmp->width = this_width;
@@ -1384,6 +1386,8 @@
       else
        {
          for (i = 0; i < cmp->glyph_len; i++)
+           /* TAB in a composition means display glyphs with padding
+              space on the left or right.  */
            if ((c = COMPOSITION_GLYPH (cmp, i)) != '\t')
              break;
          if (c == '\t')

=== modified file 'src/term.c'
--- a/src/term.c        2011-08-30 21:16:49 +0000
+++ b/src/term.c        2011-09-15 16:22:58 +0000
@@ -574,6 +574,8 @@
              {
                int c = COMPOSITION_GLYPH (cmp, i);
 
+               /* TAB in a composition means display glyphs with
+                  padding space on the left or right.  */
                if (c == '\t')
                  continue;
                if (char_charset (c, charset_list, NULL))

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2011-09-14 21:45:51 +0000
+++ b/src/w32term.c     2011-09-15 16:22:58 +0000
@@ -1294,6 +1294,8 @@
       old_font = SelectObject (s->hdc, FONT_HANDLE (font));
 
       for (i = 0, j = s->cmp_from; i < s->nchars; i++, j++)
+       /* TAB in a composition means display glyphs with padding
+          space on the left or right.  */
        if (COMPOSITION_GLYPH (s->cmp, j) != '\t')
          {
            int xx = x + s->cmp->offsets[j * 2];

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2011-09-14 21:45:51 +0000
+++ b/src/xterm.c       2011-09-15 16:22:58 +0000
@@ -1306,6 +1306,8 @@
       int y = s->ybase;
 
       for (i = 0, j = s->cmp_from; i < s->nchars; i++, j++)
+       /* TAB in a composition means display glyphs with padding
+          space on the left or right.  */
        if (COMPOSITION_GLYPH (s->cmp, j) != '\t')
          {
            int xx = x + s->cmp->offsets[j * 2];