--- a/test/test_index-wfi-f.m
+++ b/test/test_index-wfi-f.m
@@ -2,318 +2,318 @@
 
 %% test/octave.test/index-wfi-f/s-1.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [];
 %! assert(isempty (a));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/s-2.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = 1;
 %! assert(a(1),1);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/s-3.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = 1;
 %! assert(a(:),1);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/s-4.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = 1;
 %! assert(a(:,:),1);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/s-5.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = 1;
 %! assert(a(1,:),1);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/s-6.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = 1;
 %! assert(a(:,1),1);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/s-7.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = 1;
 %! assert(isempty (a(logical (0))));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/s-8.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = 1;
 %! fail("a(-1)");
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/s-9.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = 1;
 %! fail("a(2);");
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/s-10.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = 1;
 %! fail("a(2,:);");
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/s-11.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = 1;
 %! fail("a(:,2);");
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/s-12.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = 1;
 %! fail("a(-1,:);");
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/s-13.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = 1;
 %! fail("a(:,-1);");
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/s-14.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = 1;
 %! fail("a([1,2,3]);");
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/s-15.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = 1;
 %! fail("a([1;2;3]);");
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/s-16.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = 1;
 %! fail("a([1,2;3,4]);");
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/s-17.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = 1;
 %! fail("a([0,1]);");
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/s-18.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = 1;
 %! fail("a([0;1]);");
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/s-19.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = 1;
 %! fail("a([-1,0]);");
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/s-20.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = 1;
 %! fail("a([-1;0]);");
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/v-1.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [4,3,2,1];
 %! a_prime = [4;3;2;1];
 %! mid_a = [3,2];
 %! assert(a(1),4);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/v-2.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [4,3,2,1];
 %! a_prime = [4;3;2;1];
 %! mid_a = [3,2];
 %! assert(a(2),3);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/v-3.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [4,3,2,1];
 %! a_prime = [4;3;2;1];
 %! mid_a = [3,2];
 %! assert(all (a(:) == a_prime));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/v-4.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [4,3,2,1];
 %! a_prime = [4;3;2;1];
 %! mid_a = [3,2];
 %! assert(all (a(1,:) == a));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/v-5.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [4,3,2,1];
 %! a_prime = [4;3;2;1];
 %! mid_a = [3,2];
 %! assert(a(:,3),2);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/v-6.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [4,3,2,1];
 %! a_prime = [4;3;2;1];
 %! mid_a = [3,2];
 %! assert(all (a(:,:) == a));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/v-7.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [4,3,2,1];
 %! a_prime = [4;3;2;1];
 %! mid_a = [3,2];
 %! assert(all (a(logical ([0,1,1,0])) == mid_a));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/v-8.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [4,3,2,1];
 %! a_prime = [4;3;2;1];
 %! mid_a = [3,2];
 %! fail("a(0);");
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/v-9.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [4,3,2,1];
 %! a_prime = [4;3;2;1];
 %! mid_a = [3,2];
 %! fail("a(5);");
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/v-10.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [4,3,2,1];
 %! a_prime = [4;3;2;1];
 %! mid_a = [3,2];
 %! fail("a(0,1);");
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/v-11.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [4,3,2,1];
 %! a_prime = [4;3;2;1];
 %! mid_a = [3,2];
 %! assert(isempty (a(logical (0),:)));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/v-12.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [4,3,2,1];
 %! a_prime = [4;3;2;1];
 %! mid_a = [3,2];
 %! fail("a(:,0);");
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/v-13.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [4,3,2,1];
 %! a_prime = [4;3;2;1];
 %! mid_a = [3,2];
 %! assert(isempty (a([])));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/v-14.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [4,3,2,1];
 %! a_prime = [4;3;2;1];
 %! mid_a = [3,2];
 %! assert(isempty (a([],:)));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/v-15.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [4,3,2,1];
 %! a_prime = [4;3;2;1];
 %! mid_a = [3,2];
 %! assert(isempty (a(:,[])));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/m-1.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [1,2;3,4];
 %! a_fvec = [1;3;2;4];
 %! a_col_1 = [1;3];
@@ -321,12 +321,12 @@
 %! a_row_1 = [1,2];
 %! a_row_2 = [3,4];
 %! assert(all (all (a(:,:) == a)));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/m-2.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [1,2;3,4];
 %! a_fvec = [1;3;2;4];
 %! a_col_1 = [1;3];
@@ -334,12 +334,12 @@
 %! a_row_1 = [1,2];
 %! a_row_2 = [3,4];
 %! assert(all (a(:) == a_fvec));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/m-3.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [1,2;3,4];
 %! a_fvec = [1;3;2;4];
 %! a_col_1 = [1;3];
@@ -347,12 +347,12 @@
 %! a_row_1 = [1,2];
 %! a_row_2 = [3,4];
 %! fail("a(0);");
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/m-4.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [1,2;3,4];
 %! a_fvec = [1;3;2;4];
 %! a_col_1 = [1;3];
@@ -360,12 +360,12 @@
 %! a_row_1 = [1,2];
 %! a_row_2 = [3,4];
 %! assert(a(2),3);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/index-wfi-f/misc.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 0;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("off", "Octave:fortran-indexing");
 %! a = [1,2;3,4];
 %! b = a;
 %! b(:,:,2) = [5,6;7,8];
@@ -425,5 +425,4 @@
 %! assert(b(1,1:4), b9);
 %! assert(b(1,[],:), b10);
 %! assert(b(1,[]), b11);
-%! warn_fortran_indexing = wfi;
-
+%! warning ("wfi.state", "Octave:fortran-indexing");