Commit 1b511542 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(Fcall_interactively): Use AREF.

parent a02bf0c3
2008-02-19 Stefan Monnier <monnier@iro.umontreal.ca>
* callint.c (Fcall_interactively): Use AREF.
2008-02-18 Stefan Monnier <monnier@iro.umontreal.ca> 2008-02-18 Stefan Monnier <monnier@iro.umontreal.ca>
* font.c (font_unparse_xlfd): Don't ignore integer pixel size specs. * font.c (font_unparse_xlfd): Don't ignore integer pixel size specs.
......
...@@ -390,7 +390,7 @@ invoke it. If KEYS is omitted or nil, the return value of ...@@ -390,7 +390,7 @@ invoke it. If KEYS is omitted or nil, the return value of
/* Set next_event to point to the first event with parameters. */ /* Set next_event to point to the first event with parameters. */
for (next_event = 0; next_event < key_count; next_event++) for (next_event = 0; next_event < key_count; next_event++)
if (EVENT_HAS_PARAMETERS (XVECTOR (keys)->contents[next_event])) if (EVENT_HAS_PARAMETERS (AREF (keys, next_event)))
break; break;
/* Handle special starting chars `*' and `@'. Also `-'. */ /* Handle special starting chars `*' and `@'. Also `-'. */
...@@ -428,7 +428,7 @@ invoke it. If KEYS is omitted or nil, the return value of ...@@ -428,7 +428,7 @@ invoke it. If KEYS is omitted or nil, the return value of
Lisp_Object event, tem; Lisp_Object event, tem;
event = (next_event < key_count event = (next_event < key_count
? XVECTOR (keys)->contents[next_event] ? AREF (keys, next_event)
: Qnil); : Qnil);
if (EVENT_HAS_PARAMETERS (event) if (EVENT_HAS_PARAMETERS (event)
&& (tem = XCDR (event), CONSP (tem)) && (tem = XCDR (event), CONSP (tem))
...@@ -647,13 +647,13 @@ invoke it. If KEYS is omitted or nil, the return value of ...@@ -647,13 +647,13 @@ invoke it. If KEYS is omitted or nil, the return value of
(SYMBOLP (function) (SYMBOLP (function)
? (char *) SDATA (SYMBOL_NAME (function)) ? (char *) SDATA (SYMBOL_NAME (function))
: "command")); : "command"));
args[i] = XVECTOR (keys)->contents[next_event++]; args[i] = AREF (keys, next_event);
next_event++;
varies[i] = -1; varies[i] = -1;
/* Find the next parameterized event. */ /* Find the next parameterized event. */
while (next_event < key_count while (next_event < key_count
&& ! (EVENT_HAS_PARAMETERS && !(EVENT_HAS_PARAMETERS (AREF (keys, next_event))))
(XVECTOR (keys)->contents[next_event])))
next_event++; next_event++;
break; break;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment