* alloc.c, bytecode.c, ccl.c, coding.c, composite.c, data.c, dosfns.c:

* font.c, image.c, keyboard.c, lread.c, menu.c, minibuf.c, msdos.c:
* print.c, syntax.c, window.c, xmenu.c, xselect.c: Replace direct
access to `contents' member of Lisp_Vector objects with AREF and ASET
where appropriate.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/minibuf.c b/src/minibuf.c
index bed9bb39d31..d0e503486fd 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1266,7 +1266,7 @@ is used to further constrain the set of candidates.  */)
     {
       collection = check_obarray (collection);
       obsize = ASIZE (collection);
-      bucket = XVECTOR (collection)->contents[idx];
+      bucket = AREF (collection, idx);
     }
 
   while (1)
@@ -1301,7 +1301,7 @@ is used to further constrain the set of candidates.  */)
 	    break;
 	  else
 	    {
-	      bucket = XVECTOR (collection)->contents[idx];
+	      bucket = AREF (collection, idx);
 	      continue;
 	    }
 	}
@@ -1529,7 +1529,7 @@ with a space are ignored unless STRING itself starts with a space.  */)
     {
       collection = check_obarray (collection);
       obsize = ASIZE (collection);
-      bucket = XVECTOR (collection)->contents[idx];
+      bucket = AREF (collection, idx);
     }
 
   while (1)
@@ -1564,7 +1564,7 @@ with a space are ignored unless STRING itself starts with a space.  */)
 	    break;
 	  else
 	    {
-	      bucket = XVECTOR (collection)->contents[idx];
+	      bucket = AREF (collection, idx);
 	      continue;
 	    }
 	}
@@ -1772,7 +1772,7 @@ the values STRING, PREDICATE and `lambda'.  */)
 	{
 	  for (i = ASIZE (collection) - 1; i >= 0; i--)
 	    {
-	      tail = XVECTOR (collection)->contents[i];
+	      tail = AREF (collection, i);
 	      if (SYMBOLP (tail))
 		while (1)
 		  {