aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-01-29 12:01:52 +0100
committerBjörn Gustavsson <[email protected]>2016-01-29 12:01:52 +0100
commit39659b4238223de8317d1b7317a4eacd828ec6d1 (patch)
tree99e2eb7f3fc96317668fa0e023c9487a9a2af8ea /lib
parentaa62ef506163c3b56d64aa0c77350775697b5999 (diff)
parent3eb54b2053f76d3d47eed8774153be0f7a5016c3 (diff)
downloadotp-39659b4238223de8317d1b7317a4eacd828ec6d1.tar.gz
otp-39659b4238223de8317d1b7317a4eacd828ec6d1.tar.bz2
otp-39659b4238223de8317d1b7317a4eacd828ec6d1.zip
Merge branch 'maint'
* maint: Use file read buffering in dbg:trace_client Do not consider "." part of names in edlin
Diffstat (limited to 'lib')
-rw-r--r--lib/runtime_tools/src/dbg.erl4
-rw-r--r--lib/stdlib/src/edlin.erl1
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/runtime_tools/src/dbg.erl b/lib/runtime_tools/src/dbg.erl
index d2a7d734c1..22b531e6ee 100644
--- a/lib/runtime_tools/src/dbg.erl
+++ b/lib/runtime_tools/src/dbg.erl
@@ -1269,7 +1269,7 @@ gen_reader(follow_file, Filename) ->
%% Opens a file and returns a reader (lazy list).
gen_reader_file(ReadFun, Filename) ->
- case file:open(Filename, [read, raw, binary]) of
+ case file:open(Filename, [read, raw, binary, read_ahead]) of
{ok, File} ->
mk_reader(ReadFun, File);
Error ->
@@ -1294,7 +1294,7 @@ mk_reader(ReadFun, Source) ->
mk_reader_wrap([]) ->
[];
mk_reader_wrap([Hd | _] = WrapFiles) ->
- case file:open(wrap_name(Hd), [read, raw, binary]) of
+ case file:open(wrap_name(Hd), [read, raw, binary, read_ahead]) of
{ok, File} ->
mk_reader_wrap(WrapFiles, File);
Error ->
diff --git a/lib/stdlib/src/edlin.erl b/lib/stdlib/src/edlin.erl
index 19444c0502..0e9c457de2 100644
--- a/lib/stdlib/src/edlin.erl
+++ b/lib/stdlib/src/edlin.erl
@@ -465,7 +465,6 @@ word_char(C) when C >= $a, C =< $z -> true;
word_char(C) when C >= $ß, C =< $ÿ, C =/= $÷ -> true;
word_char(C) when C >= $0, C =< $9 -> true;
word_char(C) when C =:= $_ -> true;
-word_char(C) when C =:= $. -> true; % accept dot-separated names
word_char(_) -> false.
%% over_white(Chars, InitialStack, InitialCount) ->