Show
Ignore:
Timestamp:
05/18/06 16:19:18 (3 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/xdisp.c

    r4079 r4085  
    95099509  while (it->current_x < max_x) 
    95109510    { 
    9511       int x_before, x, n_glyphs_before, i, nglyphs; 
     9511      int x, n_glyphs_before, i, nglyphs; 
     9512      struct it it_before; 
    95129513 
    95139514      /* Get the next display element.  */ 
    …… 
    95219522 
    95229523      /* Produce glyphs.  */ 
    9523       x_before = it->current_x; 
    9524       n_glyphs_before = it->glyph_row->used[TEXT_AREA]; 
     9524      n_glyphs_before = row->used[TEXT_AREA]; 
     9525      it_before = *it; 
     9526 
    95259527      PRODUCE_GLYPHS (it); 
    95269528 
    9527       nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before; 
     9529      nglyphs = row->used[TEXT_AREA] - n_glyphs_before; 
    95289530      i = 0; 
    9529       x = x_before; 
     9531      x = it_before.current_x; 
    95309532      while (i < nglyphs) 
    95319533        { 
    …… 
    95349536          if (x + glyph->pixel_width > max_x) 
    95359537            { 
    9536               /* Glyph doesn't fit on line.  */ 
    9537               it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i; 
    9538               it->current_x = x; 
     9538              /* Glyph doesn't fit on line.  Backtrack.  */ 
     9539              row->used[TEXT_AREA] = n_glyphs_before; 
     9540              *it = it_before; 
    95399541              goto out; 
    95409542            } 
    …… 
    95679569  if ((height -= it->max_ascent + it->max_descent) > 0) 
    95689570    { 
     9571      /* Don't add more than one line height.  */ 
     9572      height %= FRAME_LINE_HEIGHT (it->f); 
    95699573      it->max_ascent += height / 2; 
    95709574      it->max_descent += (height + 1) / 2;