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

1 files changed, 476 insertions, 476 deletions

diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index df4ae05522..270ffe4fa0 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -1,21 +1,23 @@
-#ifndef NVIM_GLOBALS_H
-#define NVIM_GLOBALS_H
+#pragma once
 
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include "nvim/ascii.h"
+#include "nvim/arglist_defs.h"
+#include "nvim/ascii_defs.h"
 #include "nvim/event/loop.h"
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/ex_eval_defs.h"
-#include "nvim/iconv.h"
-#include "nvim/macros.h"
+#include "nvim/getchar_defs.h"
+#include "nvim/iconv_defs.h"
+#include "nvim/macros_defs.h"
 #include "nvim/mbyte.h"
 #include "nvim/menu_defs.h"
 #include "nvim/os/os_defs.h"
 #include "nvim/runtime.h"
+#include "nvim/state_defs.h"
 #include "nvim/syntax_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 #define IOSIZE         (1024 + 1)          // file I/O and sprintf buffer size
 
@@ -23,14 +25,15 @@
 #define MSG_BUF_CLEN  (MSG_BUF_LEN / 6)  // cell length (worst case: utf-8
                                          // takes 6 bytes for one cell)
 
-#ifdef MSWIN
-# define _PATHSEPSTR "\\"
-#else
-# define _PATHSEPSTR "/"
-#endif
+// FILETYPE_FILE        used for file type detection
+// FTPLUGIN_FILE        used for loading filetype plugin files
+// INDENT_FILE          used for loading indent files
+// FTOFF_FILE           used for file type detection
+// FTPLUGOF_FILE        used for loading settings files
+// INDOFF_FILE          used for loading indent files
 
 #ifndef FILETYPE_FILE
-# define FILETYPE_FILE "filetype.lua filetype.vim"
+# define FILETYPE_FILE  "filetype.lua filetype.vim"
 #endif
 
 #ifndef FTPLUGIN_FILE
@@ -56,15 +59,15 @@
 #define DFLT_ERRORFILE  "errors.err"
 
 #ifndef SYS_VIMRC_FILE
-# define SYS_VIMRC_FILE "$VIM" _PATHSEPSTR "sysinit.vim"
+# define SYS_VIMRC_FILE "$VIM/sysinit.vim"
 #endif
 
 #ifndef DFLT_HELPFILE
-# define DFLT_HELPFILE  "$VIMRUNTIME" _PATHSEPSTR "doc" _PATHSEPSTR "help.txt"
+# define DFLT_HELPFILE  "$VIMRUNTIME/doc/help.txt"
 #endif
 
 #ifndef SYNTAX_FNAME
-# define SYNTAX_FNAME   "$VIMRUNTIME" _PATHSEPSTR "syntax" _PATHSEPSTR "%s.vim"
+# define SYNTAX_FNAME   "$VIMRUNTIME/syntax/%s.vim"
 #endif
 
 #ifndef EXRC_FILE
@@ -83,7 +86,7 @@ EXTERN struct nvim_stats_s {
   int64_t fsync;
   int64_t redraw;
   int16_t log_skip;  // How many logs were tried and skipped before log_init.
-} g_stats INIT(= { 0, 0, 0 });
+} g_stats INIT( = { 0, 0, 0 });
 
 // Values for "starting".
 #define NO_SCREEN       2       // no screen updating yet
@@ -97,8 +100,8 @@ EXTERN struct nvim_stats_s {
 // up).
 #define DFLT_COLS       80              // default value for 'columns'
 #define DFLT_ROWS       24              // default value for 'lines'
-EXTERN int Rows INIT(= DFLT_ROWS);     // nr of rows in the screen
-EXTERN int Columns INIT(= DFLT_COLS);  // nr of columns in the screen
+EXTERN int Rows INIT( = DFLT_ROWS);     // nr of rows in the screen
+EXTERN int Columns INIT( = DFLT_COLS);  // nr of columns in the screen
 
 // We use 64-bit file functions here, if available.  E.g. ftello() returns
 // off_t instead of long, which helps if long is 32 bit and off_t is 64 bit.
@@ -130,11 +133,11 @@ typedef off_t off_T;
 
 // When vgetc() is called, it sets mod_mask to the set of modifiers that are
 // held down based on the MOD_MASK_* symbols that are read first.
-EXTERN int mod_mask INIT(= 0);  // current key modifiers
+EXTERN int mod_mask INIT( = 0);  // current key modifiers
 
 // The value of "mod_mask" and the unmodified character before calling merge_modifiers().
-EXTERN int vgetc_mod_mask INIT(= 0);
-EXTERN int vgetc_char INIT(= 0);
+EXTERN int vgetc_mod_mask INIT( = 0);
+EXTERN int vgetc_char INIT( = 0);
 
 // Cmdline_row is the row where the command line starts, just below the
 // last window.
@@ -145,65 +148,65 @@ EXTERN int vgetc_char INIT(= 0);
 // update_screen().
 EXTERN int cmdline_row;
 
-EXTERN bool redraw_cmdline INIT(= false);          // cmdline must be redrawn
-EXTERN bool redraw_mode INIT(= false);             // mode must be redrawn
-EXTERN bool clear_cmdline INIT(= false);           // cmdline must be cleared
-EXTERN bool mode_displayed INIT(= false);          // mode is being displayed
-EXTERN int cmdline_star INIT(= false);             // cmdline is encrypted
-EXTERN bool redrawing_cmdline INIT(= false);       // cmdline is being redrawn
-EXTERN bool cmdline_was_last_drawn INIT(= false);  // cmdline was last drawn
+EXTERN bool redraw_cmdline INIT( = false);          // cmdline must be redrawn
+EXTERN bool redraw_mode INIT( = false);             // mode must be redrawn
+EXTERN bool clear_cmdline INIT( = false);           // cmdline must be cleared
+EXTERN bool mode_displayed INIT( = false);          // mode is being displayed
+EXTERN int cmdline_star INIT( = false);             // cmdline is encrypted
+EXTERN bool redrawing_cmdline INIT( = false);       // cmdline is being redrawn
+EXTERN bool cmdline_was_last_drawn INIT( = false);  // cmdline was last drawn
 
-EXTERN bool exec_from_reg INIT(= false);         // executing register
+EXTERN bool exec_from_reg INIT( = false);         // executing register
 
 // When '$' is included in 'cpoptions' option set:
 // When a change command is given that deletes only part of a line, a dollar
 // is put at the end of the changed text. dollar_vcol is set to the virtual
 // column of this '$'.  -1 is used to indicate no $ is being displayed.
-EXTERN colnr_T dollar_vcol INIT(= -1);
+EXTERN colnr_T dollar_vcol INIT( = -1);
 
 // Variables for Insert mode completion.
 
-EXTERN char *edit_submode INIT(= NULL);         // msg for CTRL-X submode
-EXTERN char *edit_submode_pre INIT(= NULL);     // prepended to edit_submode
-EXTERN char *edit_submode_extra INIT(= NULL);   // appended to edit_submode
+EXTERN char *edit_submode INIT( = NULL);         // msg for CTRL-X submode
+EXTERN char *edit_submode_pre INIT( = NULL);     // prepended to edit_submode
+EXTERN char *edit_submode_extra INIT( = NULL);   // appended to edit_submode
 EXTERN hlf_T edit_submode_highl;                // highl. method for extra info
 
 // state for putting characters in the message area
-EXTERN int cmdmsg_rl INIT(= false);  // cmdline is drawn right to left
+EXTERN bool cmdmsg_rl INIT( = false);  // cmdline is drawn right to left
 EXTERN int msg_col;
 EXTERN int msg_row;
 EXTERN int msg_scrolled;        // Number of screen lines that windows have
                                 // scrolled because of printing messages.
 // when true don't set need_wait_return in msg_puts_attr()
 // when msg_scrolled is non-zero
-EXTERN bool msg_scrolled_ign INIT(= false);
+EXTERN bool msg_scrolled_ign INIT( = false);
 // Whether the screen is damaged due to scrolling. Sometimes msg_scrolled
 // is reset before the screen is redrawn, so we need to keep track of this.
-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 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
-EXTERN bool msg_didany INIT(= false);       // msg_outstr() was used at all
-EXTERN bool msg_nowait INIT(= false);       // don't wait for this msg
-EXTERN int emsg_off INIT(= 0);              // don't display errors for now,
-                                            // unless 'debug' is set.
-EXTERN bool info_message INIT(= false);     // printing informative message
-EXTERN bool msg_hist_off INIT(= false);     // don't add messages to history
-EXTERN bool need_clr_eos INIT(= false);     // need to clear text before
-                                            // displaying a message.
-EXTERN int emsg_skip INIT(= 0);             // don't display errors for
-                                            // expression that is skipped
-EXTERN bool emsg_severe INIT(= false);      // use message of next of several
-                                            //  emsg() calls for throw
+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 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
+EXTERN bool msg_didany INIT( = false);       // msg_outstr() was used at all
+EXTERN bool msg_nowait INIT( = false);       // don't wait for this msg
+EXTERN int emsg_off INIT( = 0);              // don't display errors for now,
+                                             // unless 'debug' is set.
+EXTERN bool info_message INIT( = false);     // printing informative message
+EXTERN bool msg_hist_off INIT( = false);     // don't add messages to history
+EXTERN bool need_clr_eos INIT( = false);     // need to clear text before
+                                             // displaying a message.
+EXTERN int emsg_skip INIT( = 0);             // don't display errors for
+                                             // expression that is skipped
+EXTERN bool emsg_severe INIT( = false);      // use message of next of several
+                                             //  emsg() calls for throw
 // used by assert_fails()
-EXTERN char *emsg_assert_fails_msg INIT(= NULL);
-EXTERN long emsg_assert_fails_lnum INIT(= 0);
-EXTERN char *emsg_assert_fails_context INIT(= NULL);
+EXTERN char *emsg_assert_fails_msg INIT( = NULL);
+EXTERN long emsg_assert_fails_lnum INIT( = 0);
+EXTERN char *emsg_assert_fails_context INIT( = NULL);
 
-EXTERN bool did_endif INIT(= false);        // just had ":endif"
+EXTERN bool did_endif INIT( = false);        // just had ":endif"
 EXTERN dict_T vimvardict;                   // Dictionary with v: variables
 EXTERN dict_T globvardict;                  // Dictionary with g: variables
 /// g: value
@@ -214,39 +217,39 @@ EXTERN bool called_vim_beep;                // set if vim_beep() is called
 EXTERN bool did_emsg_syntax;                // did_emsg set because of a
                                             // syntax error
 EXTERN int called_emsg;                     // always incremented by emsg()
-EXTERN int ex_exitval INIT(= 0);            // exit value for ex mode
-EXTERN bool emsg_on_display INIT(= false);  // there is an error message
-EXTERN bool rc_did_emsg INIT(= false);      // vim_regcomp() called emsg()
+EXTERN int ex_exitval INIT( = 0);            // exit value for ex mode
+EXTERN bool emsg_on_display INIT( = false);  // there is an error message
+EXTERN bool rc_did_emsg INIT( = false);      // vim_regcomp() called emsg()
 
-EXTERN int no_wait_return INIT(= 0);         // don't wait for return for now
-EXTERN bool need_wait_return INIT(= false);  // need to wait for return later
-EXTERN bool did_wait_return INIT(= false);   // wait_return() was used and
-                                             // nothing written since then
-EXTERN bool need_maketitle INIT(= true);     // call maketitle() soon
+EXTERN int no_wait_return INIT( = 0);         // don't wait for return for now
+EXTERN bool need_wait_return INIT( = false);  // need to wait for return later
+EXTERN bool did_wait_return INIT( = false);   // wait_return() was used and
+                                              // nothing written since then
+EXTERN bool need_maketitle INIT( = true);     // call maketitle() soon
 
-EXTERN int quit_more INIT(= false);         // 'q' hit at "--more--" msg
-EXTERN int vgetc_busy INIT(= 0);            // when inside vgetc() then > 0
+EXTERN bool quit_more INIT( = false);        // 'q' hit at "--more--" msg
+EXTERN int vgetc_busy INIT( = 0);            // when inside vgetc() then > 0
 
-EXTERN bool didset_vim INIT(= false);         // did set $VIM ourselves
-EXTERN bool didset_vimruntime INIT(= false);  // idem for $VIMRUNTIME
+EXTERN bool didset_vim INIT( = false);         // did set $VIM ourselves
+EXTERN bool didset_vimruntime INIT( = false);  // idem for $VIMRUNTIME
 
 /// Lines left before a "more" message.  Ex mode needs to be able to reset this
 /// after you type something.
-EXTERN int lines_left INIT(= -1);           // lines left for listing
-EXTERN int msg_no_more INIT(= false);       // don't use more prompt, truncate
-                                            // messages
+EXTERN int lines_left INIT( = -1);           // lines left for listing
+EXTERN bool msg_no_more INIT( = false);      // don't use more prompt, truncate
+                                             // messages
 
-EXTERN int ex_nesting_level INIT(= 0);          // nesting level
-EXTERN int debug_break_level INIT(= -1);        // break below this level
-EXTERN bool debug_did_msg INIT(= false);        // did "debug mode" message
-EXTERN int debug_tick INIT(= 0);                // breakpoint change count
-EXTERN int debug_backtrace_level INIT(= 0);     // breakpoint backtrace level
+EXTERN int ex_nesting_level INIT( = 0);          // nesting level
+EXTERN int debug_break_level INIT( = -1);        // break below this level
+EXTERN bool debug_did_msg INIT( = false);        // did "debug mode" message
+EXTERN int debug_tick INIT( = 0);                // breakpoint change count
+EXTERN int debug_backtrace_level INIT( = 0);     // breakpoint backtrace level
 
 // Values for "do_profiling".
 #define PROF_NONE       0       ///< profiling not started
 #define PROF_YES        1       ///< profiling busy
 #define PROF_PAUSED     2       ///< profiling paused
-EXTERN int do_profiling INIT(= PROF_NONE);      ///< PROF_ values
+EXTERN int do_profiling INIT( = PROF_NONE);      ///< PROF_ values
 
 /// Exception currently being thrown.  Used to pass an exception to a different
 /// cstack.  Also used for discarding an exception before it is caught or made
@@ -255,19 +258,19 @@ EXTERN except_T *current_exception;
 
 /// An exception is being thrown.  Reset when the exception is caught or as
 /// long as it is pending in a finally clause.
-EXTERN bool did_throw INIT(= false);
+EXTERN bool did_throw INIT( = false);
 
 /// Set when a throw that cannot be handled in do_cmdline() must be propagated
 /// to the cstack of the previously called do_cmdline().
-EXTERN bool need_rethrow INIT(= false);
+EXTERN bool need_rethrow INIT( = false);
 
 /// Set when a ":finish" or ":return" that cannot be handled in do_cmdline()
 /// must be propagated to the cstack of the previously called do_cmdline().
-EXTERN bool check_cstack INIT(= false);
+EXTERN bool check_cstack INIT( = false);
 
 /// Number of nested try conditionals (across function calls and ":source"
 /// commands).
-EXTERN int trylevel INIT(= 0);
+EXTERN int trylevel INIT( = 0);
 
 /// When "force_abort" is true, always skip commands after an error message,
 /// even after the outermost ":endif", ":endwhile" or ":endfor" or for a
@@ -275,7 +278,7 @@ EXTERN int trylevel INIT(= 0);
 /// non-zero (and ":silent!" was not used) or an exception is being thrown at
 /// the time an error is detected.  It is set to false when "trylevel" gets
 /// zero again and there was no error or interrupt or throw.
-EXTERN int force_abort INIT(= false);
+EXTERN bool force_abort INIT( = false);
 
 /// "msg_list" points to a variable in the stack of do_cmdline() which keeps
 /// the list of arguments of several emsg() calls, one of which is to be
@@ -285,19 +288,19 @@ EXTERN int force_abort INIT(= false);
 /// same as the "msg" field of that element, but can be identical to the "msg"
 /// field of a later list element, when the "emsg_severe" flag was set when the
 /// emsg() call was made.
-EXTERN msglist_T **msg_list INIT(= NULL);
+EXTERN msglist_T **msg_list INIT( = NULL);
 
 /// When set, don't convert an error to an exception.  Used when displaying the
 /// interrupt message or reporting an exception that is still uncaught at the
 /// top level (which has already been discarded then).  Also used for the error
 /// message when no exception can be thrown.
-EXTERN bool suppress_errthrow INIT(= false);
+EXTERN bool suppress_errthrow INIT( = false);
 
 /// The stack of all caught and not finished exceptions.  The exception on the
 /// top of the stack is the one got by evaluation of v:exception.  The complete
 /// stack of all caught and pending exceptions is embedded in the various
 /// cstacks; the pending exceptions, however, are not on the caught stack.
-EXTERN except_T *caught_stack INIT(= NULL);
+EXTERN except_T *caught_stack INIT( = NULL);
 
 ///
 /// Garbage collection can only take place when we are sure there are no Lists
@@ -307,9 +310,9 @@ EXTERN except_T *caught_stack INIT(= NULL);
 /// we do garbage collection before waiting for a char at the toplevel.
 /// "garbage_collect_at_exit" indicates garbagecollect(1) was called.
 ///
-EXTERN bool may_garbage_collect INIT(= false);
-EXTERN int want_garbage_collect INIT(= false);
-EXTERN int garbage_collect_at_exit INIT(= false);
+EXTERN bool may_garbage_collect INIT( = false);
+EXTERN bool want_garbage_collect INIT( = false);
+EXTERN bool garbage_collect_at_exit INIT( = false);
 
 // Special values for current_SID.
 #define SID_MODELINE    (-1)      // when using a modeline
@@ -324,11 +327,11 @@ EXTERN int garbage_collect_at_exit INIT(= false);
 #define SID_STR         (-10)     // for sourcing a string with no script item
 
 // Script CTX being sourced or was sourced to define the current function.
-EXTERN sctx_T current_sctx INIT(= { 0, 0, 0 });
+EXTERN sctx_T current_sctx INIT( = { 0, 0, 0 });
 // ID of the current channel making a client API call
-EXTERN uint64_t current_channel_id INIT(= 0);
+EXTERN uint64_t current_channel_id INIT( = 0);
 
-EXTERN bool did_source_packages INIT(= false);
+EXTERN bool did_source_packages INIT( = false);
 
 // Scope information for the code that indirectly triggered the current
 // provider function call
@@ -336,76 +339,77 @@ EXTERN struct caller_scope {
   sctx_T script_ctx;
   estack_T es_entry;
   char *autocmd_fname, *autocmd_match;
+  bool autocmd_fname_full;
   int autocmd_bufnr;
   void *funccalp;
 } provider_caller_scope;
-EXTERN int provider_call_nesting INIT(= 0);
+EXTERN int provider_call_nesting INIT( = 0);
 
-EXTERN int t_colors INIT(= 256);                // int value of T_CCO
+EXTERN int t_colors INIT( = 256);                // int value of T_CCO
 
 // Flags to indicate an additional string for highlight name completion.
-EXTERN int include_none INIT(= 0);     // when 1 include "None"
-EXTERN int include_default INIT(= 0);  // when 1 include "default"
-EXTERN int include_link INIT(= 0);     // when 2 include "link" and "clear"
+EXTERN int include_none INIT( = 0);     // when 1 include "None"
+EXTERN int include_default INIT( = 0);  // when 1 include "default"
+EXTERN int include_link INIT( = 0);     // when 2 include "link" and "clear"
 
 // When highlight_match is true, highlight a match, starting at the cursor
 // position.  Search_match_lines is the number of lines after the match (0 for
 // a match within one line), search_match_endcol the column number of the
 // character just after the match in the last line.
-EXTERN bool highlight_match INIT(= false);         // show search match pos
+EXTERN bool highlight_match INIT( = false);         // show search match pos
 EXTERN linenr_T search_match_lines;                // lines of matched string
 EXTERN colnr_T search_match_endcol;                // col nr of match end
-EXTERN linenr_T search_first_line INIT(= 0);       // for :{FIRST},{last}s/pat
-EXTERN linenr_T search_last_line INIT(= MAXLNUM);  // for :{first},{LAST}s/pat
+EXTERN linenr_T search_first_line INIT( = 0);       // for :{FIRST},{last}s/pat
+EXTERN linenr_T search_last_line INIT( = MAXLNUM);  // for :{first},{LAST}s/pat
 
-EXTERN bool no_smartcase INIT(= false);          // don't use 'smartcase' once
+EXTERN bool no_smartcase INIT( = false);          // don't use 'smartcase' once
 
-EXTERN int need_check_timestamps INIT(= false);  // need to check file
-                                                 // timestamps asap
-EXTERN int did_check_timestamps INIT(= false);   // did check timestamps
-                                                 // recently
-EXTERN int no_check_timestamps INIT(= 0);        // Don't check timestamps
+EXTERN bool need_check_timestamps INIT( = false);  // need to check file
+                                                   // timestamps asap
+EXTERN bool did_check_timestamps INIT( = false);   // did check timestamps
+                                                   // recently
+EXTERN int no_check_timestamps INIT( = 0);         // Don't check timestamps
 
-EXTERN int autocmd_busy INIT(= false);           // Is apply_autocmds() busy?
-EXTERN int autocmd_no_enter INIT(= false);       // *Enter autocmds disabled
-EXTERN int autocmd_no_leave INIT(= false);       // *Leave autocmds disabled
+EXTERN bool autocmd_busy INIT( = false);          // Is apply_autocmds() busy?
+EXTERN int autocmd_no_enter INIT( = false);       // *Enter autocmds disabled
+EXTERN int autocmd_no_leave INIT( = false);       // *Leave autocmds disabled
 EXTERN int modified_was_set;                     // did ":set modified"
-EXTERN int did_filetype INIT(= false);           // FileType event found
+EXTERN bool did_filetype INIT( = false);          // FileType event found
 // value for did_filetype when starting to execute autocommands
-EXTERN int keep_filetype INIT(= false);
+EXTERN bool keep_filetype INIT( = false);
 
 // When deleting the current buffer, another one must be loaded.
 // If we know which one is preferred, au_new_curbuf is set to it.
-EXTERN bufref_T au_new_curbuf INIT(= { NULL, 0, 0 });
+EXTERN bufref_T au_new_curbuf INIT( = { NULL, 0, 0 });
 
 // When deleting a buffer/window and autocmd_busy is true, do not free the
 // buffer/window. but link it in the list starting with
 // au_pending_free_buf/ap_pending_free_win, using b_next/w_next.
 // Free the buffer/window when autocmd_busy is being set to false.
-EXTERN buf_T *au_pending_free_buf INIT(= NULL);
-EXTERN win_T *au_pending_free_win INIT(= NULL);
+EXTERN buf_T *au_pending_free_buf INIT( = NULL);
+EXTERN win_T *au_pending_free_win INIT( = NULL);
 
 // Mouse coordinates, set by handle_mouse_event()
 EXTERN int mouse_grid;
 EXTERN int mouse_row;
 EXTERN int mouse_col;
-EXTERN bool mouse_past_bottom INIT(= false);  // mouse below last line
-EXTERN bool mouse_past_eol INIT(= false);     // mouse right of line
-EXTERN int mouse_dragging INIT(= 0);          // extending Visual area with
-                                              // mouse dragging
+EXTERN bool mouse_past_bottom INIT( = false);  // mouse below last line
+EXTERN bool mouse_past_eol INIT( = false);     // mouse right of line
+EXTERN int mouse_dragging INIT( = 0);          // extending Visual area with
+                                               // mouse dragging
 
 // The root of the menu hierarchy.
-EXTERN vimmenu_T *root_menu INIT(= NULL);
+EXTERN vimmenu_T *root_menu INIT( = NULL);
 // While defining the system menu, sys_menu is true.  This avoids
 // overruling of menus that the user already defined.
-EXTERN int sys_menu INIT(= false);
+EXTERN bool sys_menu INIT( = false);
 
 // All windows are linked in a list. firstwin points to the first entry,
 // lastwin to the last entry (can be the same as firstwin) and curwin to the
 // currently active window.
 EXTERN win_T *firstwin;              // first window
 EXTERN win_T *lastwin;               // last window
-EXTERN win_T *prevwin INIT(= NULL);  // previous window
+EXTERN win_T *prevwin INIT( = NULL);  // previous window
 #define ONE_WINDOW (firstwin == lastwin)
 #define FOR_ALL_FRAMES(frp, first_frame) \
   for ((frp) = first_frame; (frp) != NULL; (frp) = (frp)->fr_next)  // NOLINT
@@ -416,10 +420,9 @@ EXTERN win_T *prevwin INIT(= NULL);  // previous window
   FOR_ALL_TABS(tp) \
   FOR_ALL_WINDOWS_IN_TAB(wp, tp)
 
-// -V:FOR_ALL_WINDOWS_IN_TAB:501
 #define FOR_ALL_WINDOWS_IN_TAB(wp, tp) \
-  for (win_T *wp = ((tp) == curtab) \
-       ? firstwin : (tp)->tp_firstwin; wp != NULL; wp = wp->w_next)
+  for (win_T *wp = ((tp) == curtab) ? firstwin : (tp)->tp_firstwin; \
+       wp != NULL; wp = wp->w_next)
 
 EXTERN win_T *curwin;        // currently active window
 
@@ -432,7 +435,7 @@ typedef struct {
 /// When executing autocommands for a buffer that is not in any window, a
 /// special window is created to handle the side effects.  When autocommands
 /// nest we may need more than one.
-EXTERN kvec_t(aucmdwin_T) aucmd_win_vec INIT(= KV_INITIAL_VALUE);
+EXTERN kvec_t(aucmdwin_T) aucmd_win_vec INIT( = KV_INITIAL_VALUE);
 #define aucmd_win (aucmd_win_vec.items)
 #define AUCMD_WIN_COUNT ((int)aucmd_win_vec.size)
 
@@ -446,16 +449,16 @@ EXTERN frame_T *topframe;      // top of the window frame tree
 EXTERN tabpage_T *first_tabpage;
 EXTERN tabpage_T *curtab;
 EXTERN tabpage_T *lastused_tabpage;
-EXTERN bool redraw_tabline INIT(= false);  // need to redraw tabline
+EXTERN bool redraw_tabline INIT( = false);  // need to redraw tabline
 
 // Iterates over all tabs in the tab list
 #define FOR_ALL_TABS(tp) for (tabpage_T *(tp) = first_tabpage; (tp) != NULL; (tp) = (tp)->tp_next)
 
 // All buffers are linked in a list. 'firstbuf' points to the first entry,
 // 'lastbuf' to the last entry and 'curbuf' to the currently active buffer.
-EXTERN buf_T    *firstbuf INIT(= NULL);  // first buffer
-EXTERN buf_T *lastbuf INIT(= NULL);   // last buffer
-EXTERN buf_T *curbuf INIT(= NULL);    // currently active buffer
+EXTERN buf_T    *firstbuf INIT( = NULL);  // first buffer
+EXTERN buf_T *lastbuf INIT( = NULL);   // last buffer
+EXTERN buf_T *curbuf INIT( = NULL);    // currently active buffer
 
 // Iterates over all buffers in the buffer list.
 #define FOR_ALL_BUFFERS(buf) \
@@ -466,16 +469,12 @@ EXTERN buf_T *curbuf INIT(= NULL);    // currently active buffer
 #define FOR_ALL_BUF_WININFO(buf, wip) \
   for ((wip) = (buf)->b_wininfo; (wip) != NULL; (wip) = (wip)->wi_next)   // NOLINT
 
-// Iterate through all the signs placed in a buffer
-#define FOR_ALL_SIGNS_IN_BUF(buf, sign) \
-  for ((sign) = (buf)->b_signlist; (sign) != NULL; (sign) = (sign)->se_next)   // NOLINT
-
 // List of files being edited (global argument list).  curwin->w_alist points
 // to this when the window is using the global argument list.
 EXTERN alist_T global_alist;    // global argument list
-EXTERN int max_alist_id INIT(= 0);     ///< the previous argument list id
-EXTERN bool arg_had_last INIT(= false);     // accessed last file in
-                                            // global_alist
+EXTERN int max_alist_id INIT( = 0);     ///< the previous argument list id
+EXTERN bool arg_had_last INIT( = false);     // accessed last file in
+                                             // global_alist
 
 EXTERN int ru_col;              // column for ruler
 EXTERN int ru_wid;              // 'rulerfmt' width of ruler when non-zero
@@ -485,61 +484,61 @@ EXTERN int sc_col;              // column for shown command
 // updating).
 
 // First NO_SCREEN, then NO_BUFFERS, then 0 when startup finished.
-EXTERN int starting INIT(= NO_SCREEN);
+EXTERN int starting INIT( = NO_SCREEN);
 // true when planning to exit. Might keep running if there is a changed buffer.
-EXTERN bool exiting INIT(= false);
+EXTERN bool exiting INIT( = false);
 // internal value of v:dying
-EXTERN int v_dying INIT(= 0);
+EXTERN int v_dying INIT( = 0);
 // is stdin a terminal?
-EXTERN bool stdin_isatty INIT(= true);
+EXTERN bool stdin_isatty INIT( = true);
 // is stdout a terminal?
-EXTERN bool stdout_isatty INIT(= true);
+EXTERN bool stdout_isatty INIT( = true);
 // is stderr a terminal?
-EXTERN bool stderr_isatty INIT(= true);
+EXTERN bool stderr_isatty INIT( = true);
 
 /// filedesc set by embedder for reading first buffer like `cmd | nvim -`
-EXTERN int stdin_fd INIT(= -1);
+EXTERN int stdin_fd INIT( = -1);
 
 // true when doing full-screen output, otherwise only writing some messages.
-EXTERN int full_screen INIT(= false);
+EXTERN bool full_screen INIT( = false);
 
 /// Non-zero when only "safe" commands are allowed
-EXTERN int secure INIT(= 0);
+EXTERN int secure INIT( = 0);
 
 /// Non-zero when changing text and jumping to another window or editing another buffer is not
 /// allowed.
-EXTERN int textlock INIT(= 0);
+EXTERN int textlock INIT( = 0);
 
 /// Non-zero when no buffer name can be changed, no buffer can be deleted and
 /// current directory can't be changed. Used for SwapExists et al.
-EXTERN int allbuf_lock INIT(= 0);
+EXTERN int allbuf_lock INIT( = 0);
 
 /// Non-zero when evaluating an expression in a "sandbox".  Several things are
 /// not allowed then.
-EXTERN int sandbox INIT(= 0);
+EXTERN int sandbox INIT( = 0);
 
 /// Batch-mode: "-es", "-Es", "-l" commandline argument was given.
-EXTERN int silent_mode INIT(= false);
+EXTERN bool silent_mode INIT( = false);
 
 /// Start position of active Visual selection.
 EXTERN pos_T VIsual;
 /// Whether Visual mode is active.
-EXTERN int VIsual_active INIT(= false);
+EXTERN bool VIsual_active INIT( = false);
 /// Whether Select mode is active.
-EXTERN int VIsual_select INIT(= false);
+EXTERN bool VIsual_select INIT( = false);
 /// Register name for Select mode
-EXTERN int VIsual_select_reg INIT(= 0);
+EXTERN int VIsual_select_reg INIT( = 0);
 /// Restart Select mode when next cmd finished
-EXTERN int restart_VIsual_select INIT(= 0);
+EXTERN int restart_VIsual_select INIT( = 0);
 /// Whether to restart the selection after a Select-mode mapping or menu.
 EXTERN int VIsual_reselect;
 /// Type of Visual mode.
-EXTERN int VIsual_mode INIT(= 'v');
+EXTERN int VIsual_mode INIT( = 'v');
 /// true when redoing Visual.
-EXTERN int redo_VIsual_busy INIT(= false);
+EXTERN bool redo_VIsual_busy INIT( = false);
 
 // The Visual area is remembered for reselection.
-EXTERN int resel_VIsual_mode INIT(= NUL);       // 'v', 'V', or Ctrl-V
+EXTERN int resel_VIsual_mode INIT( = NUL);       // 'v', 'V', or Ctrl-V
 EXTERN linenr_T resel_VIsual_line_count;        // number of lines
 EXTERN colnr_T resel_VIsual_vcol;               // nr of cols or end col
 
@@ -551,40 +550,40 @@ EXTERN pos_T where_paste_started;
 // <RETURN> or <ESC> is typed. It is set when an auto-indent is done, and
 // reset when any other editing is done on the line. If an <ESC> or <RETURN>
 // is received, and did_ai is true, the line is truncated.
-EXTERN bool did_ai INIT(= false);
+EXTERN bool did_ai INIT( = false);
 
 // Column of first char after autoindent.  0 when no autoindent done.  Used
 // when 'backspace' is 0, to avoid backspacing over autoindent.
-EXTERN colnr_T ai_col INIT(= 0);
+EXTERN colnr_T ai_col INIT( = 0);
 
 // This is a character which will end a start-middle-end comment when typed as
 // the first character on a new line.  It is taken from the last character of
 // the "end" comment leader when the COM_AUTO_END flag is given for that
 // comment end in 'comments'.  It is only valid when did_ai is true.
-EXTERN int end_comment_pending INIT(= NUL);
+EXTERN int end_comment_pending INIT( = NUL);
 
 // This flag is set after a ":syncbind" to let the check_scrollbind() function
 // know that it should not attempt to perform scrollbinding due to the scroll
 // that was a result of the ":syncbind." (Otherwise, check_scrollbind() will
 // undo some of the work done by ":syncbind.")  -ralston
-EXTERN bool did_syncbind INIT(= false);
+EXTERN bool did_syncbind INIT( = false);
 
 // This flag is set when a smart indent has been performed. When the next typed
 // character is a '{' the inserted tab will be deleted again.
-EXTERN bool did_si INIT(= false);
+EXTERN bool did_si INIT( = false);
 
 // This flag is set after an auto indent. If the next typed character is a '}'
 // one indent will be removed.
-EXTERN bool can_si INIT(= false);
+EXTERN bool can_si INIT( = false);
 
 // This flag is set after an "O" command. If the next typed character is a '{'
 // one indent will be removed.
-EXTERN bool can_si_back INIT(= false);
+EXTERN bool can_si_back INIT( = false);
 
-EXTERN int old_indent INIT(= 0);  ///< for ^^D command in insert mode
+EXTERN int old_indent INIT( = 0);  ///< for ^^D command in insert mode
 
 // w_cursor before formatting text.
-EXTERN pos_T saved_cursor INIT(= { 0, 0, 0 });
+EXTERN pos_T saved_cursor INIT( = { 0, 0, 0 });
 
 // Stuff for insert mode.
 EXTERN pos_T Insstart;                  // This is where the latest
@@ -596,11 +595,11 @@ EXTERN pos_T Insstart;                  // This is where the latest
 EXTERN pos_T Insstart_orig;
 
 // Stuff for MODE_VREPLACE state.
-EXTERN linenr_T orig_line_count INIT(= 0);       // Line count when "gR" started
-EXTERN int vr_lines_changed INIT(= 0);      // #Lines changed by "gR" so far
+EXTERN linenr_T orig_line_count INIT( = 0);       // Line count when "gR" started
+EXTERN int vr_lines_changed INIT( = 0);      // #Lines changed by "gR" so far
 
 // increase around internal delete/replace
-EXTERN int inhibit_delete_count INIT(= 0);
+EXTERN int inhibit_delete_count INIT( = 0);
 
 // These flags are set based upon 'fileencoding'.
 // The characters are internally stored as UTF-8
@@ -617,7 +616,7 @@ EXTERN int inhibit_delete_count INIT(= 0);
 #define DBCS_DEBUG     (-1)
 
 /// Encoding used when 'fencs' is set to "default"
-EXTERN char *fenc_default INIT(= NULL);
+EXTERN char *fenc_default INIT( = NULL);
 
 /// "State" is the main state of Vim.
 /// There are other variables that modify the state:
@@ -626,69 +625,70 @@ EXTERN char *fenc_default INIT(= NULL);
 ///                    before typing the motion command.
 ///    motion_force:   Last motion_force from do_pending_operator()
 ///    debug_mode:     Debug mode
-EXTERN int State INIT(= MODE_NORMAL);
+EXTERN int State INIT( = MODE_NORMAL);
 
-EXTERN bool debug_mode INIT(= false);
-EXTERN bool finish_op INIT(= false);    // true while an operator is pending
-EXTERN long opcount INIT(= 0);          // count for pending operator
-EXTERN int motion_force INIT(= 0);       // motion force for pending operator
+EXTERN bool debug_mode INIT( = false);
+EXTERN bool finish_op INIT( = false);    // true while an operator is pending
+EXTERN int opcount INIT( = 0);           // count for pending operator
+EXTERN int motion_force INIT( = 0);      // motion force for pending operator
 
 // Ex Mode (Q) state
-EXTERN bool exmode_active INIT(= false);  // true if Ex mode is active
+EXTERN bool exmode_active INIT( = false);  // true if Ex mode is active
 
 /// Flag set when normal_check() should return 0 when entering Ex mode.
-EXTERN bool pending_exmode_active INIT(= false);
+EXTERN bool pending_exmode_active INIT( = false);
 
-EXTERN bool ex_no_reprint INIT(= false);   // No need to print after z or p.
+EXTERN bool ex_no_reprint INIT( = false);   // No need to print after z or p.
 
 // 'inccommand' command preview state
-EXTERN bool cmdpreview INIT(= false);
+EXTERN bool cmdpreview INIT( = false);
 
-EXTERN int reg_recording INIT(= 0);     // register for recording  or zero
-EXTERN int reg_executing INIT(= 0);     // register being executed or zero
+EXTERN int reg_recording INIT( = 0);     // register for recording  or zero
+EXTERN int reg_executing INIT( = 0);     // register being executed or zero
 // Flag set when peeking a character and found the end of executed register
-EXTERN bool pending_end_reg_executing INIT(= false);
-EXTERN int reg_recorded INIT(= 0);      // last recorded register or zero
-
-EXTERN int no_mapping INIT(= false);    // currently no mapping allowed
-EXTERN int no_zero_mapping INIT(= 0);   // mapping zero not allowed
-EXTERN int allow_keys INIT(= false);    // allow key codes when no_mapping is set
-EXTERN int no_u_sync INIT(= 0);         // Don't call u_sync()
-EXTERN int u_sync_once INIT(= 0);       // Call u_sync() once when evaluating
-                                        // an expression.
-
-EXTERN bool force_restart_edit INIT(= false);  // force restart_edit after
-                                               // ex_normal returns
-EXTERN int restart_edit INIT(= 0);      // call edit when next cmd finished
+EXTERN bool pending_end_reg_executing INIT( = false);
+EXTERN int reg_recorded INIT( = 0);      // last recorded register or zero
+
+EXTERN int no_mapping INIT( = false);    // currently no mapping allowed
+EXTERN int no_zero_mapping INIT( = 0);   // mapping zero not allowed
+EXTERN int allow_keys INIT( = false);    // allow key codes when no_mapping is set
+EXTERN int no_u_sync INIT( = 0);         // Don't call u_sync()
+EXTERN int u_sync_once INIT( = 0);       // Call u_sync() once when evaluating
+                                         // an expression.
+
+EXTERN bool force_restart_edit INIT( = false);  // force restart_edit after
+                                                // ex_normal returns
+EXTERN int restart_edit INIT( = 0);      // call edit when next cmd finished
 EXTERN int arrow_used;                  // Normally false, set to true after
                                         // hitting cursor key in insert mode.
                                         // Used by vgetorpeek() to decide when
                                         // to call u_sync()
-EXTERN bool ins_at_eol INIT(= false);   // put cursor after eol when
-                                        // restarting edit after CTRL-O
+EXTERN bool ins_at_eol INIT( = false);   // put cursor after eol when
+                                         // restarting edit after CTRL-O
 
-EXTERN bool no_abbr INIT(= true);       // true when no abbreviations loaded
+EXTERN bool no_abbr INIT( = true);       // true when no abbreviations loaded
 
-EXTERN int mapped_ctrl_c INIT(= 0);  // Modes where CTRL-C is mapped.
-EXTERN bool ctrl_c_interrupts INIT(= true);  // CTRL-C sets got_int
+EXTERN int mapped_ctrl_c INIT( = 0);  // Modes where CTRL-C is mapped.
+EXTERN bool ctrl_c_interrupts INIT( = true);  // CTRL-C sets got_int
 
 EXTERN cmdmod_T cmdmod;                 // Ex command modifiers
 
-EXTERN int msg_silent INIT(= 0);         // don't print messages
-EXTERN int emsg_silent INIT(= 0);        // don't print error messages
-EXTERN bool emsg_noredir INIT(= false);  // don't redirect error messages
-EXTERN bool cmd_silent INIT(= false);    // don't echo the command line
+EXTERN int msg_silent INIT( = 0);         // don't print messages
+EXTERN int emsg_silent INIT( = 0);        // don't print error messages
+EXTERN bool emsg_noredir INIT( = false);  // don't redirect error messages
+EXTERN bool cmd_silent INIT( = false);    // don't echo the command line
 
-EXTERN bool in_assert_fails INIT(= false);  // assert_fails() active
+EXTERN bool in_assert_fails INIT( = false);  // assert_fails() active
 
 // Values for swap_exists_action: what to do when swap file already exists
 #define SEA_NONE        0       // don't use dialog
 #define SEA_DIALOG      1       // use dialog when possible
 #define SEA_QUIT        2       // quit editing the file
 #define SEA_RECOVER     3       // recover the file
+#define SEA_READONLY    4       // no dialog, mark buffer as read-only
 
-EXTERN int swap_exists_action INIT(= SEA_NONE);  ///< For dialog when swap file already exists.
-EXTERN bool swap_exists_did_quit INIT(= false);  ///< Selected "quit" at the dialog.
+EXTERN int swap_exists_action INIT( = SEA_NONE);  ///< For dialog when swap file already exists.
+EXTERN bool swap_exists_did_quit INIT( = false);  ///< Selected "quit" at the dialog.
 
 EXTERN char IObuff[IOSIZE];                 ///< Buffer for sprintf, I/O, etc.
 EXTERN char NameBuff[MAXPATHL];             ///< Buffer for expanding file names
@@ -702,338 +702,340 @@ EXTERN char os_buf[                         ///< Buffer for the os/ layer
 ];
 
 // When non-zero, postpone redrawing.
-EXTERN int RedrawingDisabled INIT(= 0);
+EXTERN int RedrawingDisabled INIT( = 0);
 
-EXTERN int readonlymode INIT(= false);