Mercurial > emacs
changeset 91949:d3395bc69ea8
(Fcall_interactively): Use AREF.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 19 Feb 2008 04:03:01 +0000 |
| parents | c54733a34155 |
| children | d758efc0f23f |
| files | src/ChangeLog src/callint.c |
| diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Feb 19 02:21:08 2008 +0000 +++ b/src/ChangeLog Tue Feb 19 04:03:01 2008 +0000 @@ -1,3 +1,7 @@ +2008-02-19 Stefan Monnier <monnier@iro.umontreal.ca> + + * callint.c (Fcall_interactively): Use AREF. + 2008-02-18 Stefan Monnier <monnier@iro.umontreal.ca> * font.c (font_unparse_xlfd): Don't ignore integer pixel size specs.
--- a/src/callint.c Tue Feb 19 02:21:08 2008 +0000 +++ b/src/callint.c Tue Feb 19 04:03:01 2008 +0000 @@ -390,7 +390,7 @@ /* Set next_event to point to the first event with parameters. */ 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; /* Handle special starting chars `*' and `@'. Also `-'. */ @@ -428,7 +428,7 @@ Lisp_Object event, tem; event = (next_event < key_count - ? XVECTOR (keys)->contents[next_event] + ? AREF (keys, next_event) : Qnil); if (EVENT_HAS_PARAMETERS (event) && (tem = XCDR (event), CONSP (tem)) @@ -647,13 +647,13 @@ (SYMBOLP (function) ? (char *) SDATA (SYMBOL_NAME (function)) : "command")); - args[i] = XVECTOR (keys)->contents[next_event++]; + args[i] = AREF (keys, next_event); + next_event++; varies[i] = -1; /* Find the next parameterized event. */ while (next_event < key_count - && ! (EVENT_HAS_PARAMETERS - (XVECTOR (keys)->contents[next_event]))) + && !(EVENT_HAS_PARAMETERS (AREF (keys, next_event)))) next_event++; break;