Merge branch 'colorcolchar' into 20230125_mix

1 files changed, 16 insertions, 2 deletions

diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h
index e57e08ace2..414f1a6fc5 100644
--- a/src/nvim/buffer_defs.h
+++ b/src/nvim/buffer_defs.h
@@ -93,6 +93,21 @@ typedef uint64_t disptick_T;  // display tick type
 #include "nvim/syntax_defs.h"
 #include "nvim/terminal.h"
 
+typedef enum {
+  kColorcolBehind = 1
+} colorcol_flags_T;
+
+// Structure to define data associated with a colorcolumn.
+typedef struct {
+  int col;        // The column number to highlight.
+  int ch;         // The character to draw in the column.
+
+  char* syn_name; // The highlight group name. Must be free'd.
+  int syn_attr;   // The attribute. Will be set before a redraw.
+
+  int flags;      // Additional flags
+} colorcol_T;
+
 // The taggy struct is used to store the information about a :tag command.
 typedef struct taggy {
   char *tagname;                // tag name
@@ -1177,7 +1192,6 @@ struct window_S {
     int diff;
     int msgsep;
     int eob;
-    int colorcol;
     int lastline;
   } w_p_fcs_chars;
 
@@ -1338,7 +1352,7 @@ struct window_S {
   uint32_t w_p_wbr_flags;           // flags for 'winbar'
   uint32_t w_p_fde_flags;           // flags for 'foldexpr'
   uint32_t w_p_fdt_flags;           // flags for 'foldtext'
-  int *w_p_cc_cols;                 // array of columns to highlight or NULL
+  colorcol_T *w_p_cc_cols;          // array of columns to highlight or NULL
   uint8_t w_p_culopt_flags;         // flags for cursorline highlighting
   long w_p_siso;                    // 'sidescrolloff' local value
   long w_p_so;                      // 'scrolloff' local value