comparison src/keymap.c @ 55006:5429150a04f3

(Fkey_description): Fix the usual int/Lisp_Object mixup.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 20 Apr 2004 19:44:26 +0000
parents f0a7441d22f6
children 623ab06bb37b 30dd490f06f2
comparison
equal deleted inserted replaced
55005:992e27c1be23 55006:5429150a04f3
1956 Lisp_Object keys, prefix; 1956 Lisp_Object keys, prefix;
1957 { 1957 {
1958 int len = 0; 1958 int len = 0;
1959 int i, i_byte; 1959 int i, i_byte;
1960 Lisp_Object *args; 1960 Lisp_Object *args;
1961 int size = Flength (keys); 1961 int size = XINT (Flength (keys));
1962 Lisp_Object list; 1962 Lisp_Object list;
1963 Lisp_Object sep = build_string (" "); 1963 Lisp_Object sep = build_string (" ");
1964 Lisp_Object key; 1964 Lisp_Object key;
1965 int add_meta = 0; 1965 int add_meta = 0;
1966 1966
1967 if (!NILP (prefix)) 1967 if (!NILP (prefix))
1968 size += Flength (prefix); 1968 size += XINT (Flength (prefix));
1969 1969
1970 /* This has one extra element at the end that we don't pass to Fconcat. */ 1970 /* This has one extra element at the end that we don't pass to Fconcat. */
1971 args = (Lisp_Object *) alloca (size * 4 * sizeof (Lisp_Object)); 1971 args = (Lisp_Object *) alloca (size * 4 * sizeof (Lisp_Object));
1972 1972
1973 /* In effect, this computes 1973 /* In effect, this computes
1994 if (STRINGP (list)) 1994 if (STRINGP (list))
1995 size = SCHARS (list); 1995 size = SCHARS (list);
1996 else if (VECTORP (list)) 1996 else if (VECTORP (list))
1997 size = XVECTOR (list)->size; 1997 size = XVECTOR (list)->size;
1998 else if (CONSP (list)) 1998 else if (CONSP (list))
1999 size = Flength (list); 1999 size = XINT (Flength (list));
2000 else 2000 else
2001 wrong_type_argument (Qarrayp, list); 2001 wrong_type_argument (Qarrayp, list);
2002 2002
2003 i = i_byte = 0; 2003 i = i_byte = 0;
2004 2004