aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2009-10-16 19:01:21 +0000
committerEli Zaretskii2009-10-16 19:01:21 +0000
commit5d8adb2c20579d0377273ff3f2c7c0aacc2c43c1 (patch)
tree02d07d04e5edea3cb9cbaf861b4c6546ea136e2b /src
parentb61374aba3a5ab6bcde7cfbd401923cb84b1211b (diff)
downloademacs-5d8adb2c20579d0377273ff3f2c7c0aacc2c43c1.tar.gz
emacs-5d8adb2c20579d0377273ff3f2c7c0aacc2c43c1.zip
(x_produce_glyphs): Fix typos in comments.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index cad27a9aed4..24826fa3b96 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -21116,10 +21116,10 @@ x_produce_glyphs (it)
21116 later. 21116 later.
21117 21117
21118 Note: It seems that we don't have to record multibyte_p in 21118 Note: It seems that we don't have to record multibyte_p in
21119 struct glyph because the character code itself tells if or 21119 struct glyph because the character code itself tells whether
21120 not the character is multibyte. Thus, in the future, we must 21120 or not the character is multibyte. Thus, in the future, we
21121 consider eliminating the field `multibyte_p' in the struct 21121 must consider eliminating the field `multibyte_p' in the
21122 glyph. */ 21122 struct glyph. */
21123 int saved_multibyte_p = it->multibyte_p; 21123 int saved_multibyte_p = it->multibyte_p;
21124 21124
21125 /* Maybe translate single-byte characters to multibyte, or the 21125 /* Maybe translate single-byte characters to multibyte, or the
@@ -21285,9 +21285,9 @@ x_produce_glyphs (it)
21285 } 21285 }
21286 else if (it->char_to_display == '\n') 21286 else if (it->char_to_display == '\n')
21287 { 21287 {
21288 /* A newline has no width but we need the height of the line. 21288 /* A newline has no width, but we need the height of the
21289 But if previous part of the line set a height, don't 21289 line. But if previous part of the line sets a height,
21290 increase that height */ 21290 don't increase that height */
21291 21291
21292 Lisp_Object height; 21292 Lisp_Object height;
21293 Lisp_Object total_height = Qnil; 21293 Lisp_Object total_height = Qnil;
@@ -21482,12 +21482,12 @@ x_produce_glyphs (it)
21482 } 21482 }
21483 else if (it->what == IT_COMPOSITION && it->cmp_it.ch < 0) 21483 else if (it->what == IT_COMPOSITION && it->cmp_it.ch < 0)
21484 { 21484 {
21485 /* A static compositoin. 21485 /* A static composition.
21486 21486
21487 Note: A composition is represented as one glyph in the 21487 Note: A composition is represented as one glyph in the
21488 glyph matrix. There are no padding glyphs. 21488 glyph matrix. There are no padding glyphs.
21489 21489
21490 Important is that pixel_width, ascent, and descent are the 21490 Important note: pixel_width, ascent, and descent are the
21491 values of what is drawn by draw_glyphs (i.e. the values of 21491 values of what is drawn by draw_glyphs (i.e. the values of
21492 the overall glyphs composed). */ 21492 the overall glyphs composed). */
21493 struct face *face = FACE_FROM_ID (it->f, it->face_id); 21493 struct face *face = FACE_FROM_ID (it->f, it->face_id);
@@ -21502,15 +21502,15 @@ x_produce_glyphs (it)
21502 the composition for the current face font, calculate them 21502 the composition for the current face font, calculate them
21503 now. Theoretically, we have to check all fonts for the 21503 now. Theoretically, we have to check all fonts for the
21504 glyphs, but that requires much time and memory space. So, 21504 glyphs, but that requires much time and memory space. So,
21505 here we check only the font of the first glyph. This leads 21505 here we check only the font of the first glyph. This may
21506 to incorrect display, but it's very rare, and C-l (recenter) 21506 lead to incorrect display, but it's very rare, and C-l
21507 can correct the display anyway. */ 21507 (recenter-top-bottom) can correct the display anyway. */
21508 if (! cmp->font || cmp->font != font) 21508 if (! cmp->font || cmp->font != font)
21509 { 21509 {
21510 /* Ascent and descent of the font of the first character 21510 /* Ascent and descent of the font of the first character
21511 of this composition (adjusted by baseline offset). 21511 of this composition (adjusted by baseline offset).
21512 Ascent and descent of overall glyphs should not be less 21512 Ascent and descent of overall glyphs should not be less
21513 than them respectively. */ 21513 than these, respectively. */
21514 int font_ascent, font_descent, font_height; 21514 int font_ascent, font_descent, font_height;
21515 /* Bounding box of the overall glyphs. */ 21515 /* Bounding box of the overall glyphs. */
21516 int leftmost, rightmost, lowest, highest; 21516 int leftmost, rightmost, lowest, highest;
@@ -21539,7 +21539,7 @@ x_produce_glyphs (it)
21539 21539
21540 pos = (STRINGP (it->string) ? IT_STRING_CHARPOS (*it) 21540 pos = (STRINGP (it->string) ? IT_STRING_CHARPOS (*it)
21541 : IT_CHARPOS (*it)); 21541 : IT_CHARPOS (*it));
21542 /* When no suitable font found, use the default font. */ 21542 /* If no suitable font is found, use the default font. */
21543 font_not_found_p = font == NULL; 21543 font_not_found_p = font == NULL;
21544 if (font_not_found_p) 21544 if (font_not_found_p)
21545 { 21545 {