aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2001-01-26 10:25:48 +0000
committerGerd Moellmann2001-01-26 10:25:48 +0000
commit202c1b5b8bdfe995003d349d0cee22e645b829b5 (patch)
tree40a09ea5c06f9504a8e7f8f1d17b9b2149c47d0c /src
parent9b1adbd5a213c871622fee974894cd33f0babc63 (diff)
downloademacs-202c1b5b8bdfe995003d349d0cee22e645b829b5.tar.gz
emacs-202c1b5b8bdfe995003d349d0cee22e645b829b5.zip
(display_line): Simplify check for glyphs fitting
entirely in the line.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index b205e8a432a..2081343677e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12227,12 +12227,9 @@ display_line (it)
12227 hpos_before = it->hpos; 12227 hpos_before = it->hpos;
12228 x_before = x; 12228 x_before = x;
12229 12229
12230 if ((nglyphs == 1 12230 if (it->current_x < it->last_visible_x)
12231 /* A wide multibyte character produces multiple glyphs on
12232 tty window .*/
12233 || !SINGLE_BYTE_CHAR_P (it->c))
12234 && it->current_x < it->last_visible_x)
12235 { 12231 {
12232 /* Glyphs produced fit entirely in the line. */
12236 it->hpos += nglyphs; 12233 it->hpos += nglyphs;
12237 row->ascent = max (row->ascent, it->max_ascent); 12234 row->ascent = max (row->ascent, it->max_ascent);
12238 row->height = max (row->height, it->max_ascent + it->max_descent); 12235 row->height = max (row->height, it->max_ascent + it->max_descent);