diff options
| author | Kim F. Storm | 2006-03-22 22:47:22 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2006-03-22 22:47:22 +0000 |
| commit | 5bd3b1b2da76eaccb84eb55caa2c2856025f9b3a (patch) | |
| tree | 88faa83ec6ce9557691c8a0bf365a39815941e05 /src | |
| parent | ea049c5e0a79e9a475e9ba0ab32571ea2184ec32 (diff) | |
| download | emacs-5bd3b1b2da76eaccb84eb55caa2c2856025f9b3a.tar.gz emacs-5bd3b1b2da76eaccb84eb55caa2c2856025f9b3a.zip | |
* xdisp.c: Undo 2006-03-21 change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index b83d8250df9..7b1c5cd96fb 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -19383,7 +19383,7 @@ draw_glyphs (w, x, row, area, start, end, hl, overlaps) | |||
| 19383 | Called from x_produce_glyphs when IT->glyph_row is non-null. */ | 19383 | Called from x_produce_glyphs when IT->glyph_row is non-null. */ |
| 19384 | 19384 | ||
| 19385 | static INLINE void | 19385 | static INLINE void |
| 19386 | store_next_glyph (it) | 19386 | append_glyph (it) |
| 19387 | struct it *it; | 19387 | struct it *it; |
| 19388 | { | 19388 | { |
| 19389 | struct glyph *glyph; | 19389 | struct glyph *glyph; |
| @@ -19707,7 +19707,7 @@ append_stretch_glyph (it, object, width, height, ascent) | |||
| 19707 | ASCENT must be in the range 0 <= ASCENT <= 100. */ | 19707 | ASCENT must be in the range 0 <= ASCENT <= 100. */ |
| 19708 | 19708 | ||
| 19709 | static void | 19709 | static void |
| 19710 | generate_stretch_glyph (it) | 19710 | produce_stretch_glyph (it) |
| 19711 | struct it *it; | 19711 | struct it *it; |
| 19712 | { | 19712 | { |
| 19713 | /* (space :width WIDTH :height HEIGHT ...) */ | 19713 | /* (space :width WIDTH :height HEIGHT ...) */ |
| @@ -20133,7 +20133,7 @@ x_produce_glyphs (it) | |||
| 20133 | it->ascent + it->descent, ascent); | 20133 | it->ascent + it->descent, ascent); |
| 20134 | } | 20134 | } |
| 20135 | else | 20135 | else |
| 20136 | store_next_glyph (it); | 20136 | append_glyph (it); |
| 20137 | 20137 | ||
| 20138 | /* If characters with lbearing or rbearing are displayed | 20138 | /* If characters with lbearing or rbearing are displayed |
| 20139 | in this line, record that fact in a flag of the | 20139 | in this line, record that fact in a flag of the |
| @@ -20315,7 +20315,7 @@ x_produce_glyphs (it) | |||
| 20315 | take_vertical_position_into_account (it); | 20315 | take_vertical_position_into_account (it); |
| 20316 | 20316 | ||
| 20317 | if (it->glyph_row) | 20317 | if (it->glyph_row) |
| 20318 | store_next_glyph (it); | 20318 | append_glyph (it); |
| 20319 | } | 20319 | } |
| 20320 | it->multibyte_p = saved_multibyte_p; | 20320 | it->multibyte_p = saved_multibyte_p; |
| 20321 | } | 20321 | } |
| @@ -20595,7 +20595,7 @@ x_produce_glyphs (it) | |||
| 20595 | else if (it->what == IT_IMAGE) | 20595 | else if (it->what == IT_IMAGE) |
| 20596 | produce_image_glyph (it); | 20596 | produce_image_glyph (it); |
| 20597 | else if (it->what == IT_STRETCH) | 20597 | else if (it->what == IT_STRETCH) |
| 20598 | generate_stretch_glyph (it); | 20598 | produce_stretch_glyph (it); |
| 20599 | 20599 | ||
| 20600 | /* Accumulate dimensions. Note: can't assume that it->descent > 0 | 20600 | /* Accumulate dimensions. Note: can't assume that it->descent > 0 |
| 20601 | because this isn't true for images with `:ascent 100'. */ | 20601 | because this isn't true for images with `:ascent 100'. */ |