mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-30 15:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

diff: move diff globals to diff.h

Browse Source
This commit is contained in:
Jan Edmund Lazo
2019-11-16 12:45:44 -05:00
parent 7274f5c177
commit da7bb53d99
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/diff.h
View File

@@ -4,6 +4,13 @@
#include "nvim/pos.h" #include "nvim/pos.h"
#include "nvim/ex_cmds_defs.h" #include "nvim/ex_cmds_defs.h"
// Value set from 'diffopt'.
EXTERN int diff_context INIT(= 6); // context for folds
EXTERN int diff_foldcolumn INIT(= 2); // 'foldcolumn' for diff mode
EXTERN bool diff_need_scrollbind INIT(= false);
EXTERN bool need_diff_redraw INIT(= false); // need to call diff_redraw()
#ifdef INCLUDE_GENERATED_DECLARATIONS #ifdef INCLUDE_GENERATED_DECLARATIONS
# include "diff.h.generated.h" # include "diff.h.generated.h"
#endif #endif

6
src/nvim/globals.h
View File

@@ -400,11 +400,6 @@ EXTERN bool mouse_past_eol INIT(= false); /* mouse right of line */
EXTERN int mouse_dragging INIT(= 0); /* extending Visual area with EXTERN int mouse_dragging INIT(= 0); /* extending Visual area with
mouse dragging */ mouse dragging */
/* Value set from 'diffopt'. */
EXTERN int diff_context INIT(= 6); /* context for folds */
EXTERN int diff_foldcolumn INIT(= 2); /* 'foldcolumn' for diff mode */
EXTERN int diff_need_scrollbind INIT(= FALSE);
/* The root of the menu hierarchy. */ /* The root of the menu hierarchy. */
EXTERN vimmenu_T *root_menu INIT(= NULL); EXTERN vimmenu_T *root_menu INIT(= NULL);
/* /*
@@ -744,7 +739,6 @@ EXTERN int maptick INIT(= 0); // tick for each non-mapped char
EXTERN int must_redraw INIT(= 0); // type of redraw necessary EXTERN int must_redraw INIT(= 0); // type of redraw necessary
EXTERN bool skip_redraw INIT(= false); // skip redraw once EXTERN bool skip_redraw INIT(= false); // skip redraw once
EXTERN bool do_redraw INIT(= false); // extra redraw once EXTERN bool do_redraw INIT(= false); // extra redraw once
EXTERN bool need_diff_redraw INIT(= false); // need to call diff_redraw()
EXTERN bool must_redraw_pum INIT(= false); // redraw pum. NB: must_redraw EXTERN bool must_redraw_pum INIT(= false); // redraw pum. NB: must_redraw
// should also be set. // should also be set.