Fixup from JuliaLang#10885

Qualify more functions using stop_reading, start_reading with Base module identifier. Also touch up whitespace error in docs
mbauman · Jun 5, 2015 · f2bc28c · f2bc28c
1 parent 306bec4
commit f2bc28c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/base/REPL.jl b/base/REPL.jl
@@ -792,11 +792,11 @@ function setup_interface(repl::LineEditREPL; hascolor = repl.hascolor, extra_rep
                     LineEdit.commit_line(s)
                     # This is slightly ugly but ok for now
                     terminal = LineEdit.terminal(s)
-                    stop_reading(terminal)
+                    Base.stop_reading(terminal)
                     raw!(terminal, false) && disable_bracketed_paste(terminal)
                     LineEdit.mode(s).on_done(s, LineEdit.buffer(s), true)
                     raw!(terminal, true) && enable_bracketed_paste(terminal)
-                    start_reading(terminal)
+                    Base.start_reading(terminal)
                 else
                     break
                 end

diff --git a/base/client.jl b/base/client.jl
@@ -132,7 +132,7 @@ end
 
 function repl_callback(ast::ANY, show_value)
     global _repl_enough_stdin = true
-    stop_reading(STDIN)
+    Base.stop_reading(STDIN)
     put!(repl_channel, (ast, show_value))
 end
 

diff --git a/base/multi.jl b/base/multi.jl
@@ -793,7 +793,7 @@ end
 function process_messages(r_stream::TCPSocket, w_stream::TCPSocket; kwargs...)
     @schedule begin
         disable_nagle(r_stream)
-        start_reading(r_stream)
+        Base.start_reading(r_stream)
         wait_connected(r_stream)
         if r_stream != w_stream
             disable_nagle(w_stream)

diff --git a/doc/manual/variables-and-scoping.rst b/doc/manual/variables-and-scoping.rst
@@ -26,7 +26,7 @@ The constructs introducing such blocks are:
 -  ``for`` loops
 -  ``try`` blocks
 -  ``catch`` blocks
--  ``finally`` blocks 
+-  ``finally`` blocks
 -  ``let`` blocks
 -  ``type`` blocks.