aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2004-04-20 19:44:26 +0000
committerStefan Monnier2004-04-20 19:44:26 +0000
commit07f60146b3399b906f5e7381d8c7320044b79287 (patch)
treefefe667a8f51f645d50ed12849259c3bf5a02f76 /src
parentb349012b10a0c5a031457a8c6bd6dbfbab451f5c (diff)
downloademacs-07f60146b3399b906f5e7381d8c7320044b79287.tar.gz
emacs-07f60146b3399b906f5e7381d8c7320044b79287.zip
(Fkey_description): Fix the usual int/Lisp_Object mixup.
Diffstat (limited to 'src')
-rw-r--r--src/keymap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keymap.c b/src/keymap.c
index c9991c1874c..5786235f3f3 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1958,14 +1958,14 @@ spaces are put between sequence elements, etc. */)
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));
@@ -1996,7 +1996,7 @@ spaces are put between sequence elements, etc. */)
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