diff --git a/base/LineEdit.jl b/base/LineEdit.jl index 30f7aca305204..a4b26a15c0d62 100644 --- a/base/LineEdit.jl +++ b/base/LineEdit.jl @@ -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) @@ -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 diff --git a/base/exports.jl b/base/exports.jl index 9dd1ec523c618..7ba4179e8f126 100644 --- a/base/exports.jl +++ b/base/exports.jl @@ -1170,11 +1170,6 @@ export serialize, skip, skipchars, - start_reading, - start_timer, - start_watching, - stop_reading, - stop_timer, takebuf_array, takebuf_string, truncate, diff --git a/test/repl.jl b/test/repl.jl index 41d97fe1144ed..059415fdf8591 100644 --- a/test/repl.jl +++ b/test/repl.jl @@ -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") diff --git a/test/subarray.jl b/test/subarray.jl index 39505c17d1be5..13051bc2f564a 100644 --- a/test/subarray.jl +++ b/test/subarray.jl @@ -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