# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 739905013 0
# Node ID 82856e3ea14d6f5f6c726e91bc7148fb8672b986
# Parent  b9f27ed0228cceb03fda331cb38ee8e79e779a80
(echo_area_display): Use XFASTINT on ->height.
(copy_rope, copy_part_of_rope): Access *f as Lisp_Object.

diff -r b9f27ed0228c -r 82856e3ea14d src/xdisp.c
--- a/src/xdisp.c	Sat Jun 12 17:06:34 1993 +0000
+++ b/src/xdisp.c	Sat Jun 12 17:10:13 1993 +0000
@@ -332,7 +332,8 @@
       {
 	int i;
 
-	for (i = vpos + 1; i < vpos + XWINDOW (minibuf_window)->height; i++)
+	for (i = vpos + 1;
+	     i < vpos + XFASTINT (XWINDOW (minibuf_window)->height); i++)
 	  {
 	    get_display_line (f, i, 0);
 	    display_string (XWINDOW (minibuf_window), vpos,
@@ -1599,9 +1600,11 @@
 
   while (n--)
     {
-      if (t >= s) *t = MAKE_GLYPH (GLYPH_CHAR (*f),
-				   (GLYPH_FACE (*f)
-				    ? GLYPH_FACE (*f)
+      int glyph = XFASTINT (*f);
+
+      if (t >= s) *t = MAKE_GLYPH (GLYPH_CHAR (glyph),
+				   (GLYPH_FACE (glyph)
+				    ? GLYPH_FACE (glyph)
 				    : face));
       ++t;
       ++f;
@@ -1625,9 +1628,11 @@
 
   while (n--)
     {
-      if (t >= s) *t = MAKE_GLYPH (GLYPH_CHAR (*f),
-				   (GLYPH_FACE (*f)
-				    ? GLYPH_FACE (*f)
+      int glyph = XFASTINT (*f);
+
+      if (t >= s) *t = MAKE_GLYPH (GLYPH_CHAR (glyph),
+				   (GLYPH_FACE (glyph)
+				    ? GLYPH_FACE (glyph)
 				    : face));
       ++t;
       ++f;