diff options
| author | Karl Heuer <kwzh@gnu.org> | 1997-04-10 21:15:53 +0000 |
|---|---|---|
| committer | Karl Heuer <kwzh@gnu.org> | 1997-04-10 21:15:53 +0000 |
| commit | 1fc9e06eb228a5059cbc6e70d2b42e021c4e6b70 (patch) | |
| tree | e050bd56c1780de7e307507470c15542a6548c0d /src | |
| parent | 972b6708e595e70c18ebd783e66feb318899e8f4 (diff) | |
| download | emacs-1fc9e06eb228a5059cbc6e70d2b42e021c4e6b70.tar.gz | |
(display_text_line): Don't use Lisp_Object as integer.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index cabdf70f2ab..e777336e6c7 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -2867,7 +2867,8 @@ display_text_line (w, start, vpos, hpos, taboffset, ovstr_done) /* Truncate the prompt a little before the margin, so user input can at least start on the first line. */ - w->width > 10 ? w->width - 4 : -1) + (XFASTINT (w->width) > 10 + ? XFASTINT (w->width) - 4 : -1)) - hpos); hpos += minibuf_prompt_width; taboffset -= minibuf_prompt_width; @@ -3285,7 +3286,7 @@ display_text_line (w, start, vpos, hpos, taboffset, ovstr_done) if (p1 >= leftmargin) *p1 = (fix_glyph (f, (dp && INTEGERP (DISP_ESCAPE_GLYPH (dp)) - && GLYPH_CHAR_VALID_P (DISP_ESCAPE_GLYPH (dp)) + && GLYPH_CHAR_VALID_P (XINT (DISP_ESCAPE_GLYPH (dp))) ? XINT (DISP_ESCAPE_GLYPH (dp)) : '\\'), current_face) | rev_dir_bit); @@ -3533,7 +3534,7 @@ display_text_line (w, start, vpos, hpos, taboffset, ovstr_done) } else if (!FRAME_HAS_VERTICAL_SCROLL_BARS (f)) *p1++ = (dp && INTEGERP (DISP_BORDER_GLYPH (dp)) - ? DISP_BORDER_GLYPH (dp) + ? XINT (DISP_BORDER_GLYPH (dp)) : '|'); } desired_glyphs->used[vpos] = max (desired_glyphs->used[vpos], |