diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2024-11-25 19:15:05 +0000 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2024-11-25 19:27:38 +0000 |
| commit | c5d770d311841ea5230426cc4c868e8db27300a8 (patch) | |
| tree | dd21f70127b4b8b5f109baefc8ecc5016f507c91 /src/nvim/globals.h | |
| parent | 9be89f131f87608f224f0ee06d199fcd09d32176 (diff) | |
| parent | 081beb3659bd6d8efc3e977a160b1e72becbd8a2 (diff) | |
| download | rneovim-c5d770d311841ea5230426cc4c868e8db27300a8.tar.gz rneovim-c5d770d311841ea5230426cc4c868e8db27300a8.tar.bz2 rneovim-c5d770d311841ea5230426cc4c868e8db27300a8.zip | |
Merge remote-tracking branch 'upstream/master' into mix_20240309
Diffstat (limited to 'src/nvim/globals.h')
| -rw-r--r-- | src/nvim/globals.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/nvim/globals.h b/src/nvim/globals.h index 45a31ce6b0..472b77ccbe 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -156,7 +156,7 @@ EXTERN bool msg_scrolled_ign INIT( = false); EXTERN bool msg_did_scroll INIT( = false); EXTERN char *keep_msg INIT( = NULL); // msg to be shown after redraw -EXTERN int keep_msg_attr INIT( = 0); // highlight attr for keep_msg +EXTERN int keep_msg_hl_id INIT( = 0); // highlight id for keep_msg EXTERN bool need_fileinfo INIT( = false); // do fileinfo() after redraw EXTERN int msg_scroll INIT( = false); // msg_start() will scroll EXTERN bool msg_didout INIT( = false); // msg_outstr() was used in line @@ -713,12 +713,6 @@ EXTERN char *escape_chars INIT( = " \t\\\"|"); // need backslash in cmd line EXTERN bool keep_help_flag INIT( = false); // doing :ta from help file -// When a string option is NULL (which only happens in out-of-memory situations), it is set to -// empty_string_option, to avoid having to check for NULL everywhere. -// -// TODO(famiu): Remove this when refcounted strings are used for string options. -EXTERN char *empty_string_option INIT( = ""); - EXTERN bool redir_off INIT( = false); // no redirection for a moment EXTERN FILE *redir_fd INIT( = NULL); // message redirection file EXTERN int redir_reg INIT( = 0); // message redirection register |