# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 860706953 0
# Node ID 87db7dfa4a964d9d6385376fff6d3b959a48916b
# Parent  d3c4df8a1219fc80af27e3cc94ab5bb6fc89751b
(display_text_line): Don't use Lisp_Object as integer.

diff -r d3c4df8a1219 -r 87db7dfa4a96 src/xdisp.c
--- a/src/xdisp.c	Thu Apr 10 20:43:54 1997 +0000
+++ b/src/xdisp.c	Thu Apr 10 21:15:53 1997 +0000
@@ -2867,7 +2867,8 @@
 			       /* 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 @@
 	  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 @@
 	}
       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],