# HG changeset patch
# User Rik <octave@nomad.inbox5.com>
# Date 1287634438 25200
# Node ID 8a8eb099502e5ca5bc4b6ac37f294cf19ef3499c
# Parent  e79f59d31a74513c993ac905d25c01b2946540ba
Fix bug #31239 in isequalwithequalnans.m

diff -r e79f59d31a74 -r 8a8eb099502e scripts/ChangeLog
--- a/scripts/ChangeLog	Wed Oct 20 21:01:24 2010 -0700
+++ b/scripts/ChangeLog	Wed Oct 20 21:13:58 2010 -0700
@@ -1,3 +1,8 @@
+2010-10-20  Iain Murray <murray@cs.toronto.edu>
+
+	* general/private/__isequal__.m: Fix bug #31239 where 
+	isequalwithequalnans is incorrect.
+
 2010-10-20  Rik  <octave@nomad.inbox5.com>
 
 	* polynomial/conv.m: Remove redundant test.
diff -r e79f59d31a74 -r 8a8eb099502e scripts/general/private/__isequal__.m
--- a/scripts/general/private/__isequal__.m	Wed Oct 20 21:01:24 2010 -0700
+++ b/scripts/general/private/__isequal__.m	Wed Oct 20 21:13:58 2010 -0700
@@ -159,12 +159,12 @@
         m = (x == y);
         t = all (m);
 
-        if (!t)
-          if (nans_compare_equal)
+        if (!t) && (nans_compare_equal)
             t = isnan (x(!m)) && isnan (y(!m));
-          else
+        endif
+
+        if (!t)
             return;
-          endif
         endif
       endfor