diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2018-04-17 10:33:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-17 10:33:36 +0200 |
commit | 7a13611ba2033766da8cad73f46362bd01632c2c (patch) | |
tree | 170eff47d8e67ad5e2c484697f4bd999abf9844e /src/nvim/globals.h | |
parent | 48967695c441d13bc9faa8aae4bed8d6fb5bdc14 (diff) | |
parent | 387fbcd95cade4b0c037d18f404944676a59db09 (diff) | |
download | rneovim-7a13611ba2033766da8cad73f46362bd01632c2c.tar.gz rneovim-7a13611ba2033766da8cad73f46362bd01632c2c.tar.bz2 rneovim-7a13611ba2033766da8cad73f46362bd01632c2c.zip |
Merge #8276 'startup: Make -s - read from stdin'
Diffstat (limited to 'src/nvim/globals.h')
-rw-r--r-- | src/nvim/globals.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/globals.h b/src/nvim/globals.h index 89d93310a6..56790bc89b 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -834,10 +834,7 @@ EXTERN int do_redraw INIT(= FALSE); /* extra redraw once */ EXTERN int need_highlight_changed INIT(= true); EXTERN char *used_shada_file INIT(= NULL); // name of the ShaDa file to use -#define NSCRIPT 15 -EXTERN FILE *scriptin[NSCRIPT]; /* streams to read script from */ -EXTERN int curscript INIT(= 0); /* index in scriptin[] */ -EXTERN FILE *scriptout INIT(= NULL); /* stream to write script to */ +EXTERN FILE *scriptout INIT(= NULL); ///< Stream to write script to. // volatile because it is used in a signal handler. EXTERN volatile int got_int INIT(= false); // set to true when interrupt @@ -1085,6 +1082,7 @@ EXTERN char_u e_norange[] INIT(= N_("E481: No range allowed")); EXTERN char_u e_noroom[] INIT(= N_("E36: Not enough room")); EXTERN char_u e_notmp[] INIT(= N_("E483: Can't get temp file name")); EXTERN char_u e_notopen[] INIT(= N_("E484: Can't open file %s")); +EXTERN char_u e_notopen_2[] INIT(= N_("E484: Can't open file %s: %s")); EXTERN char_u e_notread[] INIT(= N_("E485: Can't read file %s")); EXTERN char_u e_nowrtmsg[] INIT(= N_( "E37: No write since last change (add ! to override)")); |