Skip to content

Commit ca26f91

Browse files
committed
Merge pull request #10885 from JuliaLang/cjh/fix-10854
Unexport the functions mentioned in #10854
2 parents bbe5a84 + 4eea11b commit ca26f91

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

base/LineEdit.jl

+4-4
Original file line numberDiff line numberDiff line change
@@ -1567,7 +1567,7 @@ function prompt!(term, prompt, s = init_state(term, prompt))
15671567
raw!(term, true)
15681568
enable_bracketed_paste(term)
15691569
try
1570-
start_reading(term)
1570+
Base.start_reading(term)
15711571
activate(prompt, s, term)
15721572
while true
15731573
map = keymap(s, prompt)
@@ -1583,14 +1583,14 @@ function prompt!(term, prompt, s = init_state(term, prompt))
15831583
state = :done
15841584
end
15851585
if state == :abort
1586-
stop_reading(term)
1586+
Base.stop_reading(term)
15871587
return buffer(s), false, false
15881588
elseif state == :done
1589-
stop_reading(term)
1589+
Base.stop_reading(term)
15901590
return buffer(s), true, false
15911591
elseif state == :suspend
15921592
@unix_only begin
1593-
stop_reading(term)
1593+
Base.stop_reading(term)
15941594
return buffer(s), true, true
15951595
end
15961596
else

base/exports.jl

-5
Original file line numberDiff line numberDiff line change
@@ -1171,11 +1171,6 @@ export
11711171
serialize,
11721172
skip,
11731173
skipchars,
1174-
start_reading,
1175-
start_timer,
1176-
start_watching,
1177-
stop_reading,
1178-
stop_timer,
11791174
takebuf_array,
11801175
takebuf_string,
11811176
truncate,

test/repl.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ master = Base.TTY(RawFD(fdm); readable = true)
259259
nENV = copy(ENV)
260260
nENV["TERM"] = "dumb"
261261
p = spawn(setenv(`$exename --startup-file=no --quiet`,nENV),slave,slave,slave)
262-
start_reading(master)
262+
Base.start_reading(master)
263263
Base.wait_readnb(master,1)
264264
write(master,"1\nquit()\n")
265265

test/subarray.jl

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using Base.Test
12
# import Base: ViewIndex, nextLD, dimsizeexpr, rangetype, merge_indexes, first_index, stride1expr, tailsize, subarray_linearindexing_dim
23
using Base.Cartesian
34

0 commit comments

Comments
 (0)