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

1 files changed, 18 insertions, 9 deletions

diff --git a/src/nvim/drawline.h b/src/nvim/drawline.h
index 9f60b46e1b..5a7f220a13 100644
--- a/src/nvim/drawline.h
+++ b/src/nvim/drawline.h
@@ -1,15 +1,14 @@
-#ifndef NVIM_DRAWLINE_H
-#define NVIM_DRAWLINE_H
+#pragma once
 
 #include <stdbool.h>
 #include <stdint.h>
 
 #include "klib/kvec.h"
 #include "nvim/decoration_provider.h"
-#include "nvim/fold.h"
-#include "nvim/macros.h"
-#include "nvim/screen.h"
-#include "nvim/types.h"
+#include "nvim/fold_defs.h"
+#include "nvim/macros_defs.h"
+#include "nvim/pos_defs.h"
+#include "nvim/types_defs.h"
 
 // Maximum columns for terminal highlight attributes
 #define TERM_ATTRS_MAX 1024
@@ -20,11 +19,21 @@ typedef struct {
   int win_row;
   int win_col;
 } WinExtmark;
-EXTERN kvec_t(WinExtmark) win_extmark_arr INIT(= KV_INITIAL_VALUE);
+EXTERN kvec_t(WinExtmark) win_extmark_arr INIT( = KV_INITIAL_VALUE);
 
-EXTERN bool conceal_cursor_used INIT(= false);
+EXTERN bool conceal_cursor_used INIT( = false);
+
+// Spell checking variables passed from win_update() to win_line().
+typedef struct {
+  bool spv_has_spell;         ///< drawn window has spell checking
+  bool spv_unchanged;         ///< not updating for changed text
+  int spv_checked_col;        ///< column in "checked_lnum" up to
+                              ///< which there are no spell errors
+  linenr_T spv_checked_lnum;  ///< line number for "checked_col"
+  int spv_cap_col;            ///< column to check for Cap word
+  linenr_T spv_capcol_lnum;   ///< line number for "cap_col"
+} spellvars_T;
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "drawline.h.generated.h"
 #endif
-#endif  // NVIM_DRAWLINE_H