# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1273150047 -7200
# Node ID f5f6bde82e1994c1e8f2889d261fa7933dd1ca48
# Parent  58bcda68ac11bc741a4340118335bca5f90d5255
fix null assignment bug #29785

diff -r 58bcda68ac11 -r f5f6bde82e19 liboctave/Array.cc
--- a/liboctave/Array.cc	Thu May 06 08:02:07 2010 -0400
+++ b/liboctave/Array.cc	Thu May 06 14:47:27 2010 +0200
@@ -1419,7 +1419,7 @@
 
       octave_idx_type l, u;
       bool col_vec = ndims () == 2 && columns () == 1 && rows () != 1;
-      if (i.is_scalar () && i(0) == n-1)
+      if (i.is_scalar () && i(0) == n-1 && dimensions.is_vector ())
         {
           // Stack "pop" operation.
           resize1 (n-1);
diff -r 58bcda68ac11 -r f5f6bde82e19 liboctave/ChangeLog
--- a/liboctave/ChangeLog	Thu May 06 08:02:07 2010 -0400
+++ b/liboctave/ChangeLog	Thu May 06 14:47:27 2010 +0200
@@ -1,3 +1,8 @@
+2010-05-06  Jaroslav Hajek  <highegg@gmail.com>
+
+	* Array.cc (Array::delete_elements (const idx_vector&)): Only call
+	resize1 when deleting the last element of a vector.
+
 2010-05-06  Jaroslav Hajek  <highegg@gmail.com>
 
 	* oct-norm.h: Fix include guard.