(echo_area_display): Use XFASTINT on ->height.

(copy_rope, copy_part_of_rope): Access *f as Lisp_Object.

1 files changed, 12 insertions, 7 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index 3acdaed0740..62a029c818d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -332,7 +332,8 @@ echo_area_display ()
       {
         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 @@ copy_rope (t, s, from, face)
 
   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 @@ copy_part_of_rope (t, s, from, len, face)
 
   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;