diff options
Diffstat (limited to 'src/nvim/globals.h')
| -rw-r--r-- | src/nvim/globals.h | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/src/nvim/globals.h b/src/nvim/globals.h index d7087ee928..a8c97c800d 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -404,7 +404,9 @@ EXTERN int no_check_timestamps INIT(= 0); /* Don't check timestamps */ typedef enum { HLF_8 = 0 /* Meta & special keys listed with ":map", text that is displayed different from what it is */ - , HLF_EOB // after the last line in the buffer + , HLF_EOB //< after the last line in the buffer + , HLF_TERM //< terminal cursor focused + , HLF_TERMNC //< terminal cursor unfocused , HLF_AT /* @ characters at end of screen, characters that don't really exist in the text */ , HLF_D /* directories in CTRL-D listing */ @@ -451,10 +453,10 @@ typedef enum { /* The HL_FLAGS must be in the same order as the HLF_ enums! * When changing this also adjust the default for 'highlight'. */ -#define HL_FLAGS {'8', '~', '@', 'd', 'e', 'i', 'l', 'm', 'M', 'n', 'N', 'r', \ - 's', 'S', 'c', 't', 'v', 'V', 'w', 'W', 'f', 'F', 'A', 'C', \ - 'D', 'T', '-', '>', 'B', 'P', 'R', 'L', '+', '=', 'x', 'X', \ - '*', '#', '_', '!', '.', 'o'} +#define HL_FLAGS {'8', '~', 'z', 'Z', '@', 'd', 'e', 'i', 'l', 'm', 'M', 'n', \ + 'N', 'r', 's', 'S', 'c', 't', 'v', 'V', 'w', 'W', 'f', 'F', \ + 'A', 'C', 'D', 'T', '-', '>', 'B', 'P', 'R', 'L', '+', '=', \ + 'x', 'X', '*', '#', '_', '!', '.', 'o'} EXTERN int highlight_attr[HLF_COUNT]; /* Highl. attr for each context. */ EXTERN int highlight_user[9]; /* User[1-9] attributes */ @@ -896,6 +898,14 @@ EXTERN FILE *scriptout INIT(= NULL); /* stream to write script to */ /* volatile because it is used in signal handler catch_sigint(). */ EXTERN volatile int got_int INIT(= FALSE); /* set to TRUE when interrupt signal occurred */ +EXTERN int disable_breakcheck INIT(= 0); // > 0 if breakchecks should be + // ignored. FIXME(tarruda): Hacky + // way to run functions that would + // result in *_breakcheck calls + // while events that would normally + // be deferred are being processed + // immediately. Ref: + // neovim/neovim#2371 EXTERN int bangredo INIT(= FALSE); /* set to TRUE with ! command */ EXTERN int searchcmdlen; /* length of previous search cmd */ EXTERN int reg_do_extmatch INIT(= 0); /* Used when compiling regexp: @@ -972,8 +982,8 @@ EXTERN char breakat_flags[256]; /* which characters are in 'breakat' */ * Makefile to make their value depend on the Makefile. */ #ifdef HAVE_PATHDEF -extern char_u *default_vim_dir; -extern char_u *default_vimruntime_dir; +extern char *default_vim_dir; +extern char *default_vimruntime_dir; extern char_u *compiled_user; extern char_u *compiled_sys; #endif @@ -1122,8 +1132,7 @@ EXTERN char_u e_nesting[] INIT(= N_("E22: Scripts nested too deep")); EXTERN char_u e_noalt[] INIT(= N_("E23: No alternate file")); EXTERN char_u e_noabbr[] INIT(= N_("E24: No such abbreviation")); EXTERN char_u e_nobang[] INIT(= N_("E477: No ! allowed")); -EXTERN char_u e_nogvim[] INIT(= N_( - "E25: GUI cannot be used: Not enabled at compile time")); +EXTERN char_u e_nogvim[] INIT(= N_("E25: Nvim does not have a built-in GUI")); EXTERN char_u e_nogroup[] INIT(= N_("E28: No such highlight group name: %s")); EXTERN char_u e_noinstext[] INIT(= N_("E29: No inserted text yet")); EXTERN char_u e_nolastcmd[] INIT(= N_("E30: No previous command line")); |