diff options
| author | Gerd Moellmann | 2000-04-24 13:54:04 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2000-04-24 13:54:04 +0000 |
| commit | d365f5bb0b02c5dbc4576ef149d127f4d8573c3d (patch) | |
| tree | b228aa771c5f7e05f52c20110ea4bd9951ded084 /src | |
| parent | 2efdbcddfa1d57db55790746e2dad62714f2ebc7 (diff) | |
| download | emacs-d365f5bb0b02c5dbc4576ef149d127f4d8573c3d.tar.gz emacs-d365f5bb0b02c5dbc4576ef149d127f4d8573c3d.zip | |
(x_produce_glyphs): Remove reference to struct it's
prompt_width. Add extra line spacing.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xterm.c b/src/xterm.c index f36e1e7761e..0bb64d881b1 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -1906,9 +1906,7 @@ x_produce_glyphs (it) | |||
| 1906 | else if (it->char_to_display == '\t') | 1906 | else if (it->char_to_display == '\t') |
| 1907 | { | 1907 | { |
| 1908 | int tab_width = it->tab_width * CANON_X_UNIT (it->f); | 1908 | int tab_width = it->tab_width * CANON_X_UNIT (it->f); |
| 1909 | int x = (it->current_x | 1909 | int x = it->current_x + it->continuation_lines_width; |
| 1910 | - it->prompt_width | ||
| 1911 | + it->continuation_lines_width); | ||
| 1912 | int next_tab_x = ((1 + x + tab_width - 1) / tab_width) * tab_width; | 1910 | int next_tab_x = ((1 + x + tab_width - 1) / tab_width) * tab_width; |
| 1913 | 1911 | ||
| 1914 | it->pixel_width = next_tab_x - x; | 1912 | it->pixel_width = next_tab_x - x; |
| @@ -2231,6 +2229,8 @@ x_produce_glyphs (it) | |||
| 2231 | if (it->area == TEXT_AREA) | 2229 | if (it->area == TEXT_AREA) |
| 2232 | it->current_x += it->pixel_width; | 2230 | it->current_x += it->pixel_width; |
| 2233 | 2231 | ||
| 2232 | it->descent += it->extra_line_spacing; | ||
| 2233 | |||
| 2234 | it->max_ascent = max (it->max_ascent, it->ascent); | 2234 | it->max_ascent = max (it->max_ascent, it->ascent); |
| 2235 | it->max_descent = max (it->max_descent, it->descent); | 2235 | it->max_descent = max (it->max_descent, it->descent); |
| 2236 | it->max_phys_ascent = max (it->max_phys_ascent, it->phys_ascent); | 2236 | it->max_phys_ascent = max (it->max_phys_ascent, it->phys_ascent); |