Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-230
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-231
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-232
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-233
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-234
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-235
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-236
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-237
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-238
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-239
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-240
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-152

1 files changed, 3 insertions, 3 deletions

diff --git a/src/keymap.c b/src/keymap.c
index 0e68c38d677..a4aeea8ae63 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1959,14 +1959,14 @@ spaces are put between sequence elements, etc.  */)
   int len = 0;
   int i, i_byte;
   Lisp_Object *args;
-  int size = Flength (keys);
+  int size = XINT (Flength (keys));
   Lisp_Object list;
   Lisp_Object sep = build_string (" ");
   Lisp_Object key;
   int add_meta = 0;
 
   if (!NILP (prefix))
-    size += Flength (prefix);
+    size += XINT (Flength (prefix));
 
   /* This has one extra element at the end that we don't pass to Fconcat.  */
   args = (Lisp_Object *) alloca (size * 4 * sizeof (Lisp_Object));
@@ -1997,7 +1997,7 @@ spaces are put between sequence elements, etc.  */)
   else if (VECTORP (list))
     size = XVECTOR (list)->size;
   else if (CONSP (list))
-    size = Flength (list);
+    size = XINT (Flength (list));
   else
     wrong_type_argument (Qarrayp, list);