diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2023-11-29 22:40:31 +0000 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2023-11-29 22:40:31 +0000 |
| commit | 339e2d15cc26fe86988ea06468d912a46c8d6f29 (patch) | |
| tree | a6167fc8fcfc6ae2dc102f57b2473858eac34063 /src/nvim/diff.h | |
| parent | 067dc73729267c0262438a6fdd66e586f8496946 (diff) | |
| parent | 4a8bf24ac690004aedf5540fa440e788459e5e34 (diff) | |
| download | rneovim-339e2d15cc26fe86988ea06468d912a46c8d6f29.tar.gz rneovim-339e2d15cc26fe86988ea06468d912a46c8d6f29.tar.bz2 rneovim-339e2d15cc26fe86988ea06468d912a46c8d6f29.zip | |
Merge remote-tracking branch 'upstream/master' into fix_repeatcmdline
Diffstat (limited to 'src/nvim/diff.h')
| -rw-r--r-- | src/nvim/diff.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/nvim/diff.h b/src/nvim/diff.h index 1f64465336..8b58887890 100644 --- a/src/nvim/diff.h +++ b/src/nvim/diff.h @@ -1,20 +1,18 @@ -#ifndef NVIM_DIFF_H -#define NVIM_DIFF_H +#pragma once #include <stdbool.h> #include "nvim/ex_cmds_defs.h" -#include "nvim/macros.h" -#include "nvim/pos.h" +#include "nvim/macros_defs.h" +#include "nvim/pos_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 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() +EXTERN bool need_diff_redraw INIT( = false); // need to call diff_redraw() #ifdef INCLUDE_GENERATED_DECLARATIONS # include "diff.h.generated.h" #endif -#endif // NVIM_DIFF_H |