Mercurial > emacs

changeset 17362:87db7dfa4a96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(display_text_line): Don't use Lisp_Object as integer.
author Karl Heuer <kwzh@gnu.org>
date Thu, 10 Apr 1997 21:15:53 +0000
parents d3c4df8a1219
children 0fe9203c7a06
files src/xdisp.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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],