aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1997-07-12 06:35:22 +0000
committerRichard M. Stallman1997-07-12 06:35:22 +0000
commitb264791c6b905daeb082fb5a1fa13b3457c7f82a (patch)
tree3a2bf06fae1f77f477fd8c668843eb5497727ac1
parent2f69f2ec362f43b768d560caa00a05a48a84c03c (diff)
downloademacs-b264791c6b905daeb082fb5a1fa13b3457c7f82a.tar.gz
emacs-b264791c6b905daeb082fb5a1fa13b3457c7f82a.zip
(dumpglyphs): Declare local variable first_ch as Lisp_Object, not int.
-rw-r--r--src/xterm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 2a32bcefe2d..005c3d33fbf 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -557,7 +557,8 @@ dumpglyphs (f, left, top, gp, n, hl, just_foreground, cmpcharp)
557 /* Get the face-code of the next GLYPH. */ 557 /* Get the face-code of the next GLYPH. */
558 int cf, len; 558 int cf, len;
559 GLYPH g = *gp; 559 GLYPH g = *gp;
560 int ch, first_ch, charset; 560 int ch, charset;
561 Lisp_Object first_ch;
561 /* HIGHEST and LOWEST are used while drawing a composite 562 /* HIGHEST and LOWEST are used while drawing a composite
562 character. The meanings are described later. */ 563 character. The meanings are described later. */
563 int highest, lowest; 564 int highest, lowest;
@@ -565,7 +566,7 @@ dumpglyphs (f, left, top, gp, n, hl, just_foreground, cmpcharp)
565 GLYPH_FOLLOW_ALIASES (tbase, tlen, g); 566 GLYPH_FOLLOW_ALIASES (tbase, tlen, g);
566 cf = (cmpcharp ? cmpcharp->face_work : FAST_GLYPH_FACE (g)); 567 cf = (cmpcharp ? cmpcharp->face_work : FAST_GLYPH_FACE (g));
567 ch = FAST_GLYPH_CHAR (g); 568 ch = FAST_GLYPH_CHAR (g);
568 if (gidx == 0) first_ch = ch; 569 if (gidx == 0) XSETFASTINT (first_ch, ch);
569 charset = CHAR_CHARSET (ch); 570 charset = CHAR_CHARSET (ch);
570 if (charset == CHARSET_COMPOSITION) 571 if (charset == CHARSET_COMPOSITION)
571 { 572 {