# HG changeset patch
# User Lachlan Andrew <lachlanbis@gmail.com>
# Date 1459155637 -39600
# Node ID 102b33b53ea466d7e87f4fed51f4b9b7d05b410e
# Parent  990c6c31a684d8e6a1fcfb2501128847ad9e5330
textscan: Use correct delimiters for file buffering (bug #47539)

* oct-stream.cc (textscan::do_scan): Pass only value of delimiters or
whitespace, not both.

diff -r 990c6c31a684 -r 102b33b53ea4 libinterp/corefcn/oct-stream.cc
--- a/libinterp/corefcn/oct-stream.cc	Sat Mar 26 18:14:31 2016 +1100
+++ b/libinterp/corefcn/oct-stream.cc	Mon Mar 28 20:00:37 2016 +1100
@@ -2593,7 +2593,9 @@
       buf_size = std::max (buf_size, ntimes);
     }
   // Finally, create the stream.
-  delimited_stream is (isp, whitespace + delims, max_lookahead, buf_size);
+  delimited_stream is (isp,
+                       (delim_table.empty () ? whitespace + "\r\n" : delims),
+                       max_lookahead, buf_size);
 
   // Grow retval dynamically.  "size" is half the initial size
   // (FIXME -- Should we start smaller if ntimes is large?)