Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unexport the functions mentioned in #10854 #10885

Merged
merged 1 commit into from
Apr 20, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions base/LineEdit.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1567,7 +1567,7 @@ function prompt!(term, prompt, s = init_state(term, prompt))
raw!(term, true)
enable_bracketed_paste(term)
try
start_reading(term)
Base.start_reading(term)
activate(prompt, s, term)
while true
map = keymap(s, prompt)
Expand All @@ -1583,14 +1583,14 @@ function prompt!(term, prompt, s = init_state(term, prompt))
state = :done
end
if state == :abort
stop_reading(term)
Base.stop_reading(term)
return buffer(s), false, false
elseif state == :done
stop_reading(term)
Base.stop_reading(term)
return buffer(s), true, false
elseif state == :suspend
@unix_only begin
stop_reading(term)
Base.stop_reading(term)
return buffer(s), true, true
end
else
Expand Down
5 changes: 0 additions & 5 deletions base/exports.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1170,11 +1170,6 @@ export
serialize,
skip,
skipchars,
start_reading,
start_timer,
start_watching,
stop_reading,
stop_timer,
takebuf_array,
takebuf_string,
truncate,
Expand Down
2 changes: 1 addition & 1 deletion test/repl.jl
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ master = Base.TTY(RawFD(fdm); readable = true)
nENV = copy(ENV)
nENV["TERM"] = "dumb"
p = spawn(setenv(`$exename --startup-file=no --quiet`,nENV),slave,slave,slave)
start_reading(master)
Base.start_reading(master)
Base.wait_readnb(master,1)
write(master,"1\nquit()\n")

Expand Down
1 change: 1 addition & 0 deletions test/subarray.jl
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using Base.Test
# import Base: ViewIndex, nextLD, dimsizeexpr, rangetype, merge_indexes, first_index, stride1expr, tailsize, subarray_linearindexing_dim
using Base.Cartesian

Expand Down