--- a/test/test_logical-wfi-t.m
+++ b/test/test_logical-wfi-t.m
@@ -2,353 +2,353 @@
 
 %% test/octave.test/logical-wfi-t/s-1.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [];
 %! fail("a(0);");
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/s-2.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = 2;
 %! assert(a(1) == 2);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/s-3.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = 2;
 %! assert(a(1) == 2);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/s-4.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = 2;
 %! assert(all (a(logical ([1,1])) == [2,2]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/v-1.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8,7,6];
 %! assert(isempty (a(logical ([0,0,0,0]))));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/v-2.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8,7,6];
 %! assert(all (a(logical ([1,1,1,1])) == [9,8,7,6]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/v-3.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8,7,6];
 %! assert(all (a(logical ([0,1,1,0])) == [8,7]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/v-4.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8,7,6];
 %! assert(all (a(logical ([1,1])) == [9,9]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-1.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! isempty (a(logical ([0,0,0,0])));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-2.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! all (a(logical ([1,1,1,1])) == [9;7;8;6]);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-3.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! all (a(logical ([0,1,1,0])) == [7;8]);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-4.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(a(logical (0:1),logical (0:1)) == 6);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-5.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (a(logical (0:1),2:-1:1) == [6,7]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-6.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(a(logical (0:1),logical ([0,1])) == 6);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-7.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (a(logical (0:1),[2,1]) == [6,7]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-8.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (a(logical (0:1),:) == [7,6]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-9.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(a(logical (0:1),1) == 7);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-10.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (a(logical (0:1),logical ([1,1])) == [7,6]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-11.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (a(2:-1:1,logical (0:1)) == [6;8]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-12.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (a(2:-1:1,logical ([0,1])) == [6;8]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-13.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (all (a(2:-1:1,logical ([1,1])) == [7,6;9,8])));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-14.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(a(logical ([0,1]),logical (0:1)) == 6);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-15.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (a(logical ([0,1]),2:-1:1) == [6,7]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-16.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(a(logical ([0,1]),logical ([0,1])) == 6);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-17.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (a(logical ([0,1]),[2,1]) == [6,7]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-18.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (a(logical ([0,1]),:) == [7,6]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-19.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(a(logical ([0,1]),1) == 7);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-20.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (a(logical ([0,1]),logical ([1,1])) == [7,6]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-21.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (a([2,1],logical (0:1)) == [6;8]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-22.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (a([2,1],logical ([0,1])) == [6;8]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-23.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (all (a([2,1],logical ([1,1])) == [7,6;9,8])));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-24.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (a(:,logical (0:1)) == [8;6]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-25.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (a(:,logical ([0,1])) == [8;6]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-26.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (all (a(:,logical ([1,1])) == [9,8;7,6])));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-27.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(a(1,logical (0:1)) == 8);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-28.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(a(1,logical ([0,1])) == 8);
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-29.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (a(1,logical ([1,1])) == [9,8]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-30.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (a(logical ([1,1]),logical (0:1)) == [8;6]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-31.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (all (a(logical ([1,1]),2:-1:1) == [8,9;6,7])));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-32.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (a(logical ([1,1]),logical ([0,1])) == [8;6]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-33.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (all (a(logical ([1,1]),[2,1]) == [8,9;6,7])));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-34.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (all (a(logical ([1,1]),:) == [9,8;7,6])));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-35.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (a(logical ([1,1]),1) == [9;7]));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");
 
 %% test/octave.test/logical-wfi-t/m-36.m
 %!test
-%! wfi = warn_fortran_indexing;
-%! warn_fortran_indexing = 1;
+%! wfi = warning ("query", "Octave:fortran-indexing");
+%! warning ("on", "Octave:fortran-indexing");
 %! a = [9,8;7,6];
 %! assert(all (all (a(logical ([1,1]),logical ([1,1])) == [9,8;7,6])));
-%! warn_fortran_indexing = wfi;
+%! warning ("wfi.state", "Octave:fortran-indexing");