diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-11-16 12:45:44 -0500 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-11-16 16:40:25 -0500 |
| commit | da7bb53d995b409208b29a5fd5941075230f1504 (patch) | |
| tree | bf1e9e1214d17172821121da051c6021640e893b | |
| parent | 7274f5c177d49660ed8c06998da402a09f5f31c6 (diff) | |
| download | rneovim-da7bb53d995b409208b29a5fd5941075230f1504.tar.gz rneovim-da7bb53d995b409208b29a5fd5941075230f1504.tar.bz2 rneovim-da7bb53d995b409208b29a5fd5941075230f1504.zip | |
diff: move diff globals to diff.h
| -rw-r--r-- | src/nvim/diff.h | 7 | ||||
| -rw-r--r-- | src/nvim/globals.h | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/nvim/diff.h b/src/nvim/diff.h index 3624ce29bb..99a60381bd 100644 --- a/src/nvim/diff.h +++ b/src/nvim/diff.h @@ -4,6 +4,13 @@ #include "nvim/pos.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 # include "diff.h.generated.h" #endif diff --git a/src/nvim/globals.h b/src/nvim/globals.h index e9f2800991..15ad6d8767 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -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 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. */ 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 bool skip_redraw INIT(= false); // skip 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 // should also be set. |