Merge remote-tracking branch 'upstream/master' into usermarksusermarks

1 files changed, 10 insertions, 4 deletions

diff --git a/src/nvim/main.h b/src/nvim/main.h
index 0c497a7c0e..2d54837872 100644
--- a/src/nvim/main.h
+++ b/src/nvim/main.h
@@ -1,6 +1,8 @@
 #ifndef NVIM_MAIN_H
 #define NVIM_MAIN_H
 
+#include <stdbool.h>
+
 #include "nvim/event/loop.h"
 
 // Maximum number of commands from + or -c arguments.
@@ -21,15 +23,15 @@ typedef struct {
   char cmds_tofree[MAX_ARG_CMDS];       // commands that need free()
   int n_pre_commands;                   // no. of commands from --cmd
   char *pre_commands[MAX_ARG_CMDS];     // commands from --cmd argument
+  char *luaf;                           // Lua script filename from "-l"
+  int lua_arg0;                         // Lua script args start index.
 
   int edit_type;                        // type of editing to do
   char *tagname;                        // tag from -t argument
   char *use_ef;                         // 'errorfile' from -q argument
 
-  bool input_isatty;                    // stdin is a terminal
-  bool output_isatty;                   // stdout is a terminal
-  bool err_isatty;                      // stderr is a terminal
-  bool input_neverscript;               // never treat stdin as script (-E/-Es)
+  bool input_istext;                    // stdin is text, not executable (-E/-Es)
+
   int no_swap_file;                     // "-n" argument used
   int use_debug_break_level;
   int window_count;                     // number of windows to use
@@ -40,6 +42,10 @@ typedef struct {
   char *listen_addr;                    // --listen {address}
   int remote;                           // --remote-[subcmd] {file1} {file2}
   char *server_addr;                    // --server {address}
+  char *scriptin;                       // -s {filename}
+  char *scriptout;                      // -w/-W {filename}
+  bool scriptout_append;                // append (-w) instead of overwrite (-W)
+  bool had_stdin_file;                  // explicit - as a file to edit
 } mparm_T;
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS