# HG changeset patch
# User Rik <rik@octave.org>
# Date 1414523212 25200
# Node ID cd8cf41f130ddb3d2241054c2e637b632c8a21d6
# Parent  0e077a29854f2986dfbdcf39aba563e3970069c7# Parent  d60b44acfff765ebd061b0ac1ab97ec482548c5b
maint: Periodic merge of stable to gui-release.

diff -r 0e077a29854f -r cd8cf41f130d liboctave/array/Range.h
--- a/liboctave/array/Range.h	Tue Oct 28 13:57:26 2014 -0400
+++ b/liboctave/array/Range.h	Tue Oct 28 12:06:52 2014 -0700
@@ -54,7 +54,7 @@
     : rng_base (b), rng_limit (b + (n-1) * i), rng_inc (i),
       rng_nelem (n), cache ()
   {
-    if (! xfinite (b) || ! xfinite (i) | ! xfinite (rng_limit))
+    if (! xfinite (b) || ! xfinite (i) || ! xfinite (rng_limit))
       rng_nelem = -2;
   }