Merge #2598 'set stdin as "blocking" on exit'

1 files changed, 7 insertions, 9 deletions

diff --git a/src/nvim/main.c b/src/nvim/main.c
index 5f0372f30e..fc72039b5f 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -271,17 +271,15 @@ int main(int argc, char **argv)
       || params.output_isatty || params.err_isatty);
 
   if (reading_input) {
-    // Its possible that one of the startup commands(arguments, sourced scripts
-    // or plugins) will prompt the user, so start reading from a tty stream
-    // now. 
+    // One of the startup commands (arguments, sourced scripts or plugins) may
+    // prompt the user, so start reading from a tty now.
     int fd = fileno(stdin);
     if (!params.input_isatty || params.edit_type == EDIT_STDIN) {
-      // use stderr or stdout since stdin is not a tty and/or could be used to
-      // read the file we'll edit when the "-" argument is given(eg: cat file |
-      // nvim -)
+      // Use stderr or stdout since stdin is not a tty and/or could be used to
+      // read the "-" file (eg: cat file | nvim -)
       fd = params.err_isatty ? fileno(stderr) : fileno(stdout);
     }
-    input_start_stdin(fd);
+    input_start(fd);
   }
 
   // open terminals when opening files that start with term://
@@ -388,8 +386,8 @@ int main(int argc, char **argv)
   }
 
   if (!params.headless) {
-    // Stop reading from stdin, the UI layer will take over now
-    input_stop_stdin();
+    // Stop reading from input stream, the UI layer will take over now.
+    input_stop();
     ui_builtin_start();
   }