diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-11-16 18:43:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-16 18:43:03 -0800 |
| commit | a45890e82e7cff52f9473d631a5439d2d368daa2 (patch) | |
| tree | 8beada2a3533eff9722d5069499111ec889d33f8 /src/nvim/diff.h | |
| parent | 7116a41e30903580b7527203b87f6afb26095654 (diff) | |
| parent | 3056ff4b8c39ea0679a564760c607021df4ad14f (diff) | |
| download | rneovim-a45890e82e7cff52f9473d631a5439d2d368daa2.tar.gz rneovim-a45890e82e7cff52f9473d631a5439d2d368daa2.tar.bz2 rneovim-a45890e82e7cff52f9473d631a5439d2d368daa2.zip | |
Merge #11406 from janlazo/vim-8.1.1922
vim-patch:8.1.{1922,2289,2305}
Diffstat (limited to 'src/nvim/diff.h')
| -rw-r--r-- | src/nvim/diff.h | 7 |
1 files changed, 7 insertions, 0 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 |