# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1203393781 0
# Node ID d3395bc69ea80c83aa4117124d0e0ce1e975eda7
# Parent  c54733a341558d0f6371ae2773a9aa687637f8cd
(Fcall_interactively): Use AREF.

diff -r c54733a34155 -r d3395bc69ea8 src/ChangeLog
--- 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.
diff -r c54733a34155 -r d3395bc69ea8 src/callint.c
--- 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;