diff options
Diffstat (limited to 'src/nvim/buffer_defs.h')
| -rw-r--r-- | src/nvim/buffer_defs.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h index 8f5f2c44f7..a68e841f3e 100644 --- a/src/nvim/buffer_defs.h +++ b/src/nvim/buffer_defs.h @@ -393,7 +393,7 @@ struct file_buffer { /// Change-identifier incremented for each change, including undo. /// - /// This is a dictionary item used to store b:changedtick. + /// This is a dict item used to store b:changedtick. ChangedtickDictItem changedtick_di; varnumber_T b_last_changedtick; // b:changedtick when TextChanged was @@ -533,6 +533,8 @@ struct file_buffer { char *b_p_cinsd; ///< 'cinscopedecls' char *b_p_com; ///< 'comments' char *b_p_cms; ///< 'commentstring' + char *b_p_cot; ///< 'completeopt' local value + unsigned b_cot_flags; ///< flags for 'completeopt' char *b_p_cpt; ///< 'complete' #ifdef BACKSLASH_IN_FILENAME char *b_p_csl; ///< 'completeslash' @@ -671,8 +673,8 @@ struct file_buffer { int b_bad_char; // "++bad=" argument when edit started or 0 int b_start_bomb; // 'bomb' when it was read - ScopeDictDictItem b_bufvar; ///< Variable for "b:" Dictionary. - dict_T *b_vars; ///< b: scope dictionary. + ScopeDictDictItem b_bufvar; ///< Variable for "b:" Dict. + dict_T *b_vars; ///< b: scope Dict. // When a buffer is created, it starts without a swap file. b_may_swap is // then set to indicate that a swap file may be opened later. It is reset @@ -711,7 +713,7 @@ struct file_buffer { Terminal *terminal; // Terminal instance associated with the buffer - dict_T *additional_data; // Additional data from shada file if any. + AdditionalData *additional_data; // Additional data from shada file if any. int b_mapped_ctrl_c; // modes where CTRL-C is mapped @@ -738,8 +740,6 @@ struct file_buffer { // The number for times the current line has been flushed in the memline. int flush_count; - - int b_diff_failed; // internal diff failed for this buffer }; // Stuff for diff mode. @@ -793,7 +793,7 @@ struct tabpage_S { int tp_diff_invalid; ///< list of diffs is outdated int tp_diff_update; ///< update diffs before redrawing frame_T *(tp_snapshot[SNAP_COUNT]); ///< window layout snapshots - ScopeDictDictItem tp_winvar; ///< Variable for "t:" Dictionary. + ScopeDictDictItem tp_winvar; ///< Variable for "t:" Dict. dict_T *tp_vars; ///< Internal variables, local to tab page. char *tp_localdir; ///< Absolute path of local cwd or NULL. char *tp_prevdir; ///< Previous directory. @@ -1046,8 +1046,7 @@ struct window_S { win_T *w_prev; ///< link to previous window win_T *w_next; ///< link to next window - bool w_closing; ///< window is being closed, don't let - ///< autocommands close it too. + bool w_locked; ///< don't let autocommands close the window frame_T *w_frame; ///< frame containing this window @@ -1265,8 +1264,8 @@ struct window_S { int w_scbind_pos; - ScopeDictDictItem w_winvar; ///< Variable for "w:" dictionary. - dict_T *w_vars; ///< Dictionary with w: variables. + ScopeDictDictItem w_winvar; ///< Variable for "w:" dict. + dict_T *w_vars; ///< Dict with w: variables. // The w_prev_pcmark field is used to check whether we really did jump to // a new line after setting the w_pcmark. If not, then we revert to |