X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Farray.lisp;h=2b817a3cc76516000383d97108d41b7c77bf2534;hb=2d4a0df3457bcd50916b33d374da592d8776db0a;hp=9d1045d3a44260d39b9d0f80aa03351e294a9ee8;hpb=2db3b6b4cb740d5b6512459c223859f747807b09;p=sbcl.git

diff --git a/src/code/array.lisp b/src/code/array.lisp
index 9d1045d..2b817a3 100644
--- a/src/code/array.lisp
+++ b/src/code/array.lisp
@@ -51,7 +51,9 @@
 
 (defun %data-vector-and-index (array index)
   (if (array-header-p array)
-      (%with-array-data array index nil)
+      (multiple-value-bind (vector index)
+          (%with-array-data array index nil)
+        (values vector index))
       (values array index)))
 
 ;;; It'd waste space to expand copies of error handling in every
@@ -253,7 +255,7 @@
 	      (setf (%array-dimension array axis) dim)
 	      (incf axis)))
 	  array))))
-	
+
 ;;; DATA-VECTOR-FROM-INITS returns a simple vector that has the
 ;;; specified array characteristics. Dimensions is only used to pass
 ;;; to FILL-DATA-VECTOR for error checking on the structure of