Merge remote-tracking branch 'upstream/master' into colorcolcharcolorcolchar

1 files changed, 8 insertions, 20 deletions

diff --git a/src/nvim/fold.h b/src/nvim/fold.h
index ac1e8c9419..3a70c11792 100644
--- a/src/nvim/fold.h
+++ b/src/nvim/fold.h
@@ -1,28 +1,16 @@
-#ifndef NVIM_FOLD_H
-#define NVIM_FOLD_H
+#pragma once
 
 #include <stdio.h>
 
-#include "nvim/buffer_defs.h"
-#include "nvim/garray.h"
-#include "nvim/macros.h"
-#include "nvim/pos.h"
-#include "nvim/types.h"
+#include "nvim/buffer_defs.h"  // IWYU pragma: keep
+#include "nvim/fold_defs.h"  // IWYU pragma: export
+#include "nvim/garray_defs.h"  // IWYU pragma: keep
+#include "nvim/macros_defs.h"
+#include "nvim/pos_defs.h"
+#include "nvim/types_defs.h"
 
-// Info used to pass info about a fold from the fold-detection code to the
-// code that displays the foldcolumn.
-typedef struct foldinfo {
-  linenr_T fi_lnum;             // line number where fold starts
-  int fi_level;                 // level of the fold; when this is zero the
-                                // other fields are invalid
-  int fi_low_level;             // lowest fold level that starts in the same
-                                // line
-  linenr_T fi_lines;
-} foldinfo_T;
-
-EXTERN int disable_fold_update INIT(= 0);
+EXTERN int disable_fold_update INIT( = 0);
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "fold.h.generated.h"
 #endif
-#endif  // NVIM_FOLD_H