[Emacs-diffs] Changes to emacs/src/callint.c,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/02/19 04:03:03

Index: callint.c
===================================================================
RCS file: /sources/emacs/emacs/src/callint.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -b -r1.160 -r1.161
--- callint.c   17 Feb 2008 16:57:39 -0000      1.160
+++ callint.c   19 Feb 2008 04:03:01 -0000      1.161
@@ -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;