From 6cc6e11929ad76a2dc5204aed95cb9ed1dafde23 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 23 Aug 2022 22:00:19 +0800
Subject: vim-patch:9.0.0206: redraw flags are not named specifically (#19913)

Problem:    Redraw flags are not named specifically.
Solution:   Prefix "UPD_" to the flags, for UPDate_screen().
https://github.com/vim/vim/commit/a4d158b3c839e96ed98ff87c7b7124ff4518c4ff
---
 src/nvim/fold.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 8ce24fd378..5824e02a85 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -394,7 +394,7 @@ void opFoldRange(pos_T firstpos, pos_T lastpos, int opening, int recurse, int ha
   }
   // Force a redraw to remove the Visual highlighting.
   if (had_visual) {
-    redraw_curbuf_later(INVERTED);
+    redraw_curbuf_later(UPD_INVERTED);
   }
 }
 
@@ -721,7 +721,7 @@ void deleteFold(win_T *const wp, const linenr_T start, const linenr_T end, const
     emsg(_(e_nofold));
     // Force a redraw to remove the Visual highlighting.
     if (had_visual) {
-      redraw_buf_later(wp->w_buffer, INVERTED);
+      redraw_buf_later(wp->w_buffer, UPD_INVERTED);
     }
   } else {
     // Deleting markers may make cursor column invalid
@@ -819,7 +819,7 @@ void foldUpdateAfterInsert(void)
 void foldUpdateAll(win_T *win)
 {
   win->w_foldinvalid = true;
-  redraw_later(win, NOT_VALID);
+  redraw_later(win, UPD_NOT_VALID);
 }
 
 // foldMoveTo() {{{2
-- 
cgit 


From c0d60526541a3cf977ae623471ae4a347b492af1 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Tue, 23 Aug 2022 09:33:08 +0200
Subject: perf(api): allow to use an arena for return values

---
 src/nvim/fold.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 8ce24fd378..f1630f9370 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -3212,19 +3212,19 @@ static void foldclosed_both(typval_T *argvars, typval_T *rettv, int end)
 }
 
 /// "foldclosed()" function
-void f_foldclosed(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+void f_foldclosed(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
 {
   foldclosed_both(argvars, rettv, false);
 }
 
 /// "foldclosedend()" function
-void f_foldclosedend(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+void f_foldclosedend(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
 {
   foldclosed_both(argvars, rettv, true);
 }
 
 /// "foldlevel()" function
-void f_foldlevel(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+void f_foldlevel(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
 {
   const linenr_T lnum = tv_get_lnum(argvars);
   if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count) {
@@ -3233,7 +3233,7 @@ void f_foldlevel(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 }
 
 /// "foldtext()" function
-void f_foldtext(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+void f_foldtext(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
 {
   rettv->v_type = VAR_STRING;
   rettv->vval.v_string = NULL;
@@ -3279,7 +3279,7 @@ void f_foldtext(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 }
 
 /// "foldtextresult(lnum)" function
-void f_foldtextresult(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+void f_foldtextresult(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
 {
   char_u buf[FOLD_TEXT_LEN];
   static bool entered = false;
-- 
cgit 


From b1833bb33b49a26e7552548e3541ac1480fee452 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 25 Aug 2022 09:22:44 +0800
Subject: vim-patch:partial:8.2.4001: insert complete code uses global
 variables

Problem:    Insert complete code uses global variables.
Solution:   Make variables local to the file and use accessor functions.
            (Yegappan Lakshmanan, closes vim/vim#9470)
https://github.com/vim/vim/commit/d94fbfc74a8b8073e7a256c95fa6f39fc527c726

Skip changes in comments for callback-related functions (not ported).
Also make compl_busy static again.
---
 src/nvim/fold.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 66f45e57f3..9cc17acb37 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -757,7 +757,7 @@ void clearFolding(win_T *win)
 /// The changes in lines from top to bot (inclusive).
 void foldUpdate(win_T *wp, linenr_T top, linenr_T bot)
 {
-  if (disable_fold_update || compl_busy || State & MODE_INSERT) {
+  if (disable_fold_update || State & MODE_INSERT) {
     return;
   }
 
-- 
cgit 


From 40855b0143a864739a6037921e15699445dcf8a7 Mon Sep 17 00:00:00 2001
From: Dundar Goc <gocdundar@gmail.com>
Date: Sun, 31 Jul 2022 16:20:57 +0200
Subject: refactor: replace char_u with char

Work on https://github.com/neovim/neovim/issues/459
---
 src/nvim/fold.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 9cc17acb37..b4ddb3ec08 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -1556,7 +1556,7 @@ static void foldCreateMarkers(win_T *wp, pos_T start, pos_T end)
   }
   parseMarker(wp);
 
-  foldAddMarker(buf, start, wp->w_p_fmr, foldstartmarkerlen);
+  foldAddMarker(buf, start, (char_u *)wp->w_p_fmr, foldstartmarkerlen);
   foldAddMarker(buf, end, foldendmarker, foldendmarkerlen);
 
   // Update both changes here, to avoid all folds after the start are
@@ -1575,9 +1575,9 @@ static void foldCreateMarkers(win_T *wp, pos_T start, pos_T end)
 /// Add "marker[markerlen]" in 'commentstring' to position `pos`.
 static void foldAddMarker(buf_T *buf, pos_T pos, const char_u *marker, size_t markerlen)
 {
-  char_u *cms = buf->b_p_cms;
+  char_u *cms = (char_u *)buf->b_p_cms;
   char_u *newline;
-  char_u *p = (char_u *)strstr((char *)buf->b_p_cms, "%s");
+  char_u *p = (char_u *)strstr(buf->b_p_cms, "%s");
   bool line_is_comment = false;
   linenr_T lnum = pos.lnum;
 
@@ -1621,7 +1621,7 @@ static void deleteFoldMarkers(win_T *wp, fold_T *fp, int recursive, linenr_T lnu
                         lnum_off + fp->fd_top);
     }
   }
-  foldDelMarker(wp->w_buffer, fp->fd_top + lnum_off, wp->w_p_fmr,
+  foldDelMarker(wp->w_buffer, fp->fd_top + lnum_off, (char_u *)wp->w_p_fmr,
                 foldstartmarkerlen);
   foldDelMarker(wp->w_buffer, fp->fd_top + lnum_off + fp->fd_len - 1,
                 foldendmarker, foldendmarkerlen);
@@ -1639,7 +1639,7 @@ static void foldDelMarker(buf_T *buf, linenr_T lnum, char_u *marker, size_t mark
     return;
   }
 
-  char_u *cms = buf->b_p_cms;
+  char_u *cms = (char_u *)buf->b_p_cms;
   char_u *line = ml_get_buf(buf, lnum, false);
   for (char_u *p = line; *p != NUL; p++) {
     if (STRNCMP(p, marker, markerlen) != 0) {
@@ -1729,7 +1729,7 @@ char_u *get_foldtext(win_T *wp, linenr_T lnum, linenr_T lnume, foldinfo_T foldin
 
       emsg_silent++;       // handle exceptions, but don't display errors
       text =
-        (char_u *)eval_to_string_safe((char *)wp->w_p_fdt, NULL,
+        (char_u *)eval_to_string_safe(wp->w_p_fdt, NULL,
                                       was_set_insecurely(wp, "foldtext", OPT_LOCAL));
       emsg_silent--;
 
@@ -1790,7 +1790,7 @@ char_u *get_foldtext(win_T *wp, linenr_T lnum, linenr_T lnume, foldinfo_T foldin
 static void foldtext_cleanup(char_u *str)
 {
   // Ignore leading and trailing white space in 'commentstring'.
-  char_u *cms_start = (char_u *)skipwhite((char *)curbuf->b_p_cms);
+  char_u *cms_start = (char_u *)skipwhite(curbuf->b_p_cms);
   size_t cms_slen = STRLEN(cms_start);
   while (cms_slen > 0 && ascii_iswhite(cms_start[cms_slen - 1])) {
     cms_slen--;
@@ -2854,7 +2854,7 @@ static void foldlevelIndent(fline_T *flp)
 
   // empty line or lines starting with a character in 'foldignore': level
   // depends on surrounding lines
-  if (*s == NUL || vim_strchr((char *)flp->wp->w_p_fdi, *s) != NULL) {
+  if (*s == NUL || vim_strchr(flp->wp->w_p_fdi, *s) != NULL) {
     // first and last line can't be undefined, use level 0
     if (lnum == 1 || lnum == buf->b_ml.ml_line_count) {
       flp->lvl = 0;
@@ -2907,7 +2907,7 @@ static void foldlevelExpr(fline_T *flp)
   const bool save_keytyped = KeyTyped;
 
   int c;
-  const int n = eval_foldexpr((char *)flp->wp->w_p_fde, &c);
+  const int n = eval_foldexpr(flp->wp->w_p_fde, &c);
   KeyTyped = save_keytyped;
 
   switch (c) {
@@ -2985,8 +2985,8 @@ static void foldlevelExpr(fline_T *flp)
 /// Relies on the option value to have been checked for correctness already.
 static void parseMarker(win_T *wp)
 {
-  foldendmarker = (char_u *)vim_strchr((char *)wp->w_p_fmr, ',');
-  foldstartmarkerlen = (size_t)(foldendmarker++ - wp->w_p_fmr);
+  foldendmarker = (char_u *)vim_strchr(wp->w_p_fmr, ',');
+  foldstartmarkerlen = (size_t)(foldendmarker++ - (char_u *)wp->w_p_fmr);
   foldendmarkerlen = STRLEN(foldendmarker);
 }
 
@@ -3003,7 +3003,7 @@ static void foldlevelMarker(fline_T *flp)
   int start_lvl = flp->lvl;
 
   // cache a few values for speed
-  char_u *startmarker = flp->wp->w_p_fmr;
+  char_u *startmarker = (char_u *)flp->wp->w_p_fmr;
   int cstart = *startmarker;
   startmarker++;
   int cend = *foldendmarker;
-- 
cgit 


From fb1edb2f5728d74ae811c6ab32395598cea5609b Mon Sep 17 00:00:00 2001
From: Dundar Göc <gocdundar@gmail.com>
Date: Fri, 26 Aug 2022 23:11:25 +0200
Subject: refactor: replace char_u with char

Work on https://github.com/neovim/neovim/issues/459
---
 src/nvim/fold.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index b4ddb3ec08..d8c864df5b 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -995,7 +995,7 @@ void foldAdjustVisual(void)
     start->col = 0;
   }
   if (hasFolding(end->lnum, NULL, &end->lnum)) {
-    ptr = ml_get(end->lnum);
+    ptr = (char_u *)ml_get(end->lnum);
     end->col = (colnr_T)STRLEN(ptr);
     if (end->col > 0 && *p_sel == 'o') {
       end->col--;
@@ -1588,7 +1588,7 @@ static void foldAddMarker(buf_T *buf, pos_T pos, const char_u *marker, size_t ma
 
   if (u_save(lnum - 1, lnum + 1) == OK) {
     // Check if the line ends with an unclosed comment
-    skip_comment(line, false, false, &line_is_comment);
+    skip_comment((char *)line, false, false, &line_is_comment);
     newline = xmalloc(line_len + markerlen + STRLEN(cms) + 1);
     STRCPY(newline, line);
     // Append the marker to the end of the line
@@ -1601,7 +1601,7 @@ static void foldAddMarker(buf_T *buf, pos_T pos, const char_u *marker, size_t ma
       STRCPY(newline + line_len + (p - cms) + markerlen, p + 2);
       added = markerlen + STRLEN(cms) - 2;
     }
-    ml_replace_buf(buf, lnum, newline, false);
+    ml_replace_buf(buf, lnum, (char *)newline, false);
     if (added) {
       extmark_splice_cols(buf, (int)lnum - 1, (int)line_len,
                           0, (int)added, kExtmarkUndo);
@@ -1666,7 +1666,7 @@ static void foldDelMarker(buf_T *buf, linenr_T lnum, char_u *marker, size_t mark
       assert(p >= line);
       memcpy(newline, line, (size_t)(p - line));
       STRCPY(newline + (p - line), p + len);
-      ml_replace_buf(buf, lnum, newline, false);
+      ml_replace_buf(buf, lnum, (char *)newline, false);
       extmark_splice_cols(buf, (int)lnum - 1, (int)(p - line),
                           (int)len, 0, kExtmarkUndo);
     }
@@ -3251,12 +3251,12 @@ void f_foldtext(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
     }
 
     // Find interesting text in this line.
-    char_u *s = (char_u *)skipwhite((char *)ml_get(lnum));
+    char_u *s = (char_u *)skipwhite(ml_get(lnum));
     // skip C comment-start
     if (s[0] == '/' && (s[1] == '*' || s[1] == '/')) {
       s = (char_u *)skipwhite((char *)s + 2);
       if (*skipwhite((char *)s) == NUL && lnum + 1 < foldend) {
-        s = (char_u *)skipwhite((char *)ml_get(lnum + 1));
+        s = (char_u *)skipwhite(ml_get(lnum + 1));
         if (*s == '*') {
           s = (char_u *)skipwhite((char *)s + 1);
         }
-- 
cgit 


From bd51ac2a347c0a3efb64e4b09400b7314286844c Mon Sep 17 00:00:00 2001
From: Dundar Göc <gocdundar@gmail.com>
Date: Fri, 26 Aug 2022 23:11:25 +0200
Subject: refactor: replace char_u with char

Work on https://github.com/neovim/neovim/issues/459
---
 src/nvim/fold.c | 104 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 51 insertions(+), 53 deletions(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index d8c864df5b..0f085df3d0 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -111,7 +111,7 @@ static int prev_lnum_lvl = -1;
 #define DONE_FOLD       2       // did find a fold
 
 static size_t foldstartmarkerlen;
-static char_u *foldendmarker;
+static char *foldendmarker;
 static size_t foldendmarkerlen;
 
 // Exported folding functions. {{{1
@@ -982,7 +982,7 @@ void foldAdjustVisual(void)
   }
 
   pos_T *start, *end;
-  char_u *ptr;
+  char *ptr;
 
   if (ltoreq(VIsual, curwin->w_cursor)) {
     start = &VIsual;
@@ -995,7 +995,7 @@ void foldAdjustVisual(void)
     start->col = 0;
   }
   if (hasFolding(end->lnum, NULL, &end->lnum)) {
-    ptr = (char_u *)ml_get(end->lnum);
+    ptr = ml_get(end->lnum);
     end->col = (colnr_T)STRLEN(ptr);
     if (end->col > 0 && *p_sel == 'o') {
       end->col--;
@@ -1556,7 +1556,7 @@ static void foldCreateMarkers(win_T *wp, pos_T start, pos_T end)
   }
   parseMarker(wp);
 
-  foldAddMarker(buf, start, (char_u *)wp->w_p_fmr, foldstartmarkerlen);
+  foldAddMarker(buf, start, wp->w_p_fmr, foldstartmarkerlen);
   foldAddMarker(buf, end, foldendmarker, foldendmarkerlen);
 
   // Update both changes here, to avoid all folds after the start are
@@ -1573,22 +1573,22 @@ static void foldCreateMarkers(win_T *wp, pos_T start, pos_T end)
 
 // foldAddMarker() {{{2
 /// Add "marker[markerlen]" in 'commentstring' to position `pos`.
-static void foldAddMarker(buf_T *buf, pos_T pos, const char_u *marker, size_t markerlen)
+static void foldAddMarker(buf_T *buf, pos_T pos, const char *marker, size_t markerlen)
 {
-  char_u *cms = (char_u *)buf->b_p_cms;
-  char_u *newline;
-  char_u *p = (char_u *)strstr(buf->b_p_cms, "%s");
+  char *cms = buf->b_p_cms;
+  char *newline;
+  char *p = strstr(buf->b_p_cms, "%s");
   bool line_is_comment = false;
   linenr_T lnum = pos.lnum;
 
   // Allocate a new line: old-line + 'cms'-start + marker + 'cms'-end
-  char_u *line = ml_get_buf(buf, lnum, false);
+  char *line = (char *)ml_get_buf(buf, lnum, false);
   size_t line_len = STRLEN(line);
   size_t added = 0;
 
   if (u_save(lnum - 1, lnum + 1) == OK) {
     // Check if the line ends with an unclosed comment
-    skip_comment((char *)line, false, false, &line_is_comment);
+    skip_comment(line, false, false, &line_is_comment);
     newline = xmalloc(line_len + markerlen + STRLEN(cms) + 1);
     STRCPY(newline, line);
     // Append the marker to the end of the line
@@ -1601,7 +1601,7 @@ static void foldAddMarker(buf_T *buf, pos_T pos, const char_u *marker, size_t ma
       STRCPY(newline + line_len + (p - cms) + markerlen, p + 2);
       added = markerlen + STRLEN(cms) - 2;
     }
-    ml_replace_buf(buf, lnum, (char *)newline, false);
+    ml_replace_buf(buf, lnum, newline, false);
     if (added) {
       extmark_splice_cols(buf, (int)lnum - 1, (int)line_len,
                           0, (int)added, kExtmarkUndo);
@@ -1621,7 +1621,7 @@ static void deleteFoldMarkers(win_T *wp, fold_T *fp, int recursive, linenr_T lnu
                         lnum_off + fp->fd_top);
     }
   }
-  foldDelMarker(wp->w_buffer, fp->fd_top + lnum_off, (char_u *)wp->w_p_fmr,
+  foldDelMarker(wp->w_buffer, fp->fd_top + lnum_off, wp->w_p_fmr,
                 foldstartmarkerlen);
   foldDelMarker(wp->w_buffer, fp->fd_top + lnum_off + fp->fd_len - 1,
                 foldendmarker, foldendmarkerlen);
@@ -1632,16 +1632,16 @@ static void deleteFoldMarkers(win_T *wp, fold_T *fp, int recursive, linenr_T lnu
 /// Delete 'commentstring' if it matches.
 /// If the marker is not found, there is no error message.  Could be a missing
 /// close-marker.
-static void foldDelMarker(buf_T *buf, linenr_T lnum, char_u *marker, size_t markerlen)
+static void foldDelMarker(buf_T *buf, linenr_T lnum, char *marker, size_t markerlen)
 {
   // end marker may be missing and fold extends below the last line
   if (lnum > buf->b_ml.ml_line_count) {
     return;
   }
 
-  char_u *cms = (char_u *)buf->b_p_cms;
-  char_u *line = ml_get_buf(buf, lnum, false);
-  for (char_u *p = line; *p != NUL; p++) {
+  char *cms = buf->b_p_cms;
+  char *line = (char *)ml_get_buf(buf, lnum, false);
+  for (char *p = line; *p != NUL; p++) {
     if (STRNCMP(p, marker, markerlen) != 0) {
       continue;
     }
@@ -1652,7 +1652,7 @@ static void foldDelMarker(buf_T *buf, linenr_T lnum, char_u *marker, size_t mark
     }
     if (*cms != NUL) {
       // Also delete 'commentstring' if it matches.
-      char_u *cms2 = (char_u *)strstr((char *)cms, "%s");
+      char *cms2 = strstr(cms, "%s");
       if (p - line >= cms2 - cms
           && STRNCMP(p - (cms2 - cms), cms, cms2 - cms) == 0
           && STRNCMP(p + len, cms2 + 2, STRLEN(cms2 + 2)) == 0) {
@@ -1662,11 +1662,11 @@ static void foldDelMarker(buf_T *buf, linenr_T lnum, char_u *marker, size_t mark
     }
     if (u_save(lnum - 1, lnum + 1) == OK) {
       // Make new line: text-before-marker + text-after-marker
-      char_u *newline = xmalloc(STRLEN(line) - len + 1);
+      char *newline = xmalloc(STRLEN(line) - len + 1);
       assert(p >= line);
       memcpy(newline, line, (size_t)(p - line));
       STRCPY(newline + (p - line), p + len);
-      ml_replace_buf(buf, lnum, (char *)newline, false);
+      ml_replace_buf(buf, lnum, newline, false);
       extmark_splice_cols(buf, (int)lnum - 1, (int)(p - line),
                           (int)len, 0, kExtmarkUndo);
     }
@@ -1683,10 +1683,10 @@ static void foldDelMarker(buf_T *buf, linenr_T lnum, char_u *marker, size_t mark
 /// @return the text for a closed fold
 ///
 /// Otherwise the result is in allocated memory.
-char_u *get_foldtext(win_T *wp, linenr_T lnum, linenr_T lnume, foldinfo_T foldinfo, char_u *buf)
+char *get_foldtext(win_T *wp, linenr_T lnum, linenr_T lnume, foldinfo_T foldinfo, char *buf)
   FUNC_ATTR_NONNULL_ARG(1)
 {
-  char_u *text = NULL;
+  char *text = NULL;
   // an error occurred when evaluating 'fdt' setting
   static bool got_fdt_error = false;
   int save_did_emsg = did_emsg;
@@ -1728,9 +1728,7 @@ char_u *get_foldtext(win_T *wp, linenr_T lnum, linenr_T lnume, foldinfo_T foldin
       curbuf = wp->w_buffer;
 
       emsg_silent++;       // handle exceptions, but don't display errors
-      text =
-        (char_u *)eval_to_string_safe(wp->w_p_fdt, NULL,
-                                      was_set_insecurely(wp, "foldtext", OPT_LOCAL));
+      text = eval_to_string_safe(wp->w_p_fdt, NULL, was_set_insecurely(wp, "foldtext", OPT_LOCAL));
       emsg_silent--;
 
       if (text == NULL || did_emsg) {
@@ -1751,23 +1749,23 @@ char_u *get_foldtext(win_T *wp, linenr_T lnum, linenr_T lnume, foldinfo_T foldin
     if (text != NULL) {
       // Replace unprintable characters, if there are any.  But
       // replace a TAB with a space.
-      char_u *p;
+      char *p;
       for (p = text; *p != NUL; p++) {
-        int len = utfc_ptr2len((char *)p);
+        int len = utfc_ptr2len(p);
 
         if (len > 1) {
-          if (!vim_isprintc(utf_ptr2char((char *)p))) {
+          if (!vim_isprintc(utf_ptr2char(p))) {
             break;
           }
           p += len - 1;
         } else if (*p == TAB) {
           *p = ' ';
-        } else if (ptr2cells((char *)p) > 1) {
+        } else if (ptr2cells(p) > 1) {
           break;
         }
       }
       if (*p != NUL) {
-        p = (char_u *)transstr((const char *)text, true);
+        p = transstr((const char *)text, true);
         xfree(text);
         text = p;
       }
@@ -1776,7 +1774,7 @@ char_u *get_foldtext(win_T *wp, linenr_T lnum, linenr_T lnume, foldinfo_T foldin
   if (text == NULL) {
     unsigned long count = (unsigned long)(lnume - lnum + 1);
 
-    vim_snprintf((char *)buf, FOLD_TEXT_LEN,
+    vim_snprintf(buf, FOLD_TEXT_LEN,
                  NGETTEXT("+--%3ld line folded",
                           "+--%3ld lines folded ", count),
                  count);
@@ -1787,17 +1785,17 @@ char_u *get_foldtext(win_T *wp, linenr_T lnum, linenr_T lnume, foldinfo_T foldin
 
 // foldtext_cleanup() {{{2
 /// Remove 'foldmarker' and 'commentstring' from "str" (in-place).
-static void foldtext_cleanup(char_u *str)
+static void foldtext_cleanup(char *str)
 {
   // Ignore leading and trailing white space in 'commentstring'.
-  char_u *cms_start = (char_u *)skipwhite(curbuf->b_p_cms);
+  char *cms_start = skipwhite(curbuf->b_p_cms);
   size_t cms_slen = STRLEN(cms_start);
   while (cms_slen > 0 && ascii_iswhite(cms_start[cms_slen - 1])) {
     cms_slen--;
   }
 
   // locate "%s" in 'commentstring', use the part before and after it.
-  char_u *cms_end = (char_u *)strstr((char *)cms_start, "%s");
+  char *cms_end = strstr(cms_start, "%s");
   size_t cms_elen = 0;
   if (cms_end != NULL) {
     cms_elen = cms_slen - (size_t)(cms_end - cms_start);
@@ -1809,7 +1807,7 @@ static void foldtext_cleanup(char_u *str)
     }
 
     // skip "%s" and white space after it
-    char_u *s = (char_u *)skipwhite((char *)cms_end + 2);
+    char *s = skipwhite(cms_end + 2);
     cms_elen -= (size_t)(s - cms_end);
     cms_end = s;
   }
@@ -1818,7 +1816,7 @@ static void foldtext_cleanup(char_u *str)
   bool did1 = false;
   bool did2 = false;
 
-  for (char_u *s = str; *s != NUL;) {
+  for (char *s = str; *s != NUL;) {
     size_t len = 0;
     if (STRNCMP(s, curwin->w_p_fmr, foldstartmarkerlen) == 0) {
       len = foldstartmarkerlen;
@@ -1832,7 +1830,7 @@ static void foldtext_cleanup(char_u *str)
 
       // May remove 'commentstring' start.  Useful when it's a double
       // quote and we already removed a double quote.
-      char_u *p;
+      char *p;
       for (p = s; p > str && ascii_iswhite(p[-1]); p--) {}
       if (p >= str + cms_slen
           && STRNCMP(p - cms_slen, cms_start, cms_slen) == 0) {
@@ -2850,7 +2848,7 @@ static void foldlevelIndent(fline_T *flp)
   linenr_T lnum = flp->lnum + flp->off;
 
   buf_T *buf = flp->wp->w_buffer;
-  char_u *s = (char_u *)skipwhite((char *)ml_get_buf(buf, lnum, false));
+  char *s = skipwhite((char *)ml_get_buf(buf, lnum, false));
 
   // empty line or lines starting with a character in 'foldignore': level
   // depends on surrounding lines
@@ -2985,8 +2983,8 @@ static void foldlevelExpr(fline_T *flp)
 /// Relies on the option value to have been checked for correctness already.
 static void parseMarker(win_T *wp)
 {
-  foldendmarker = (char_u *)vim_strchr(wp->w_p_fmr, ',');
-  foldstartmarkerlen = (size_t)(foldendmarker++ - (char_u *)wp->w_p_fmr);
+  foldendmarker = vim_strchr(wp->w_p_fmr, ',');
+  foldstartmarkerlen = (size_t)(foldendmarker++ - wp->w_p_fmr);
   foldendmarkerlen = STRLEN(foldendmarker);
 }
 
@@ -3003,23 +3001,23 @@ static void foldlevelMarker(fline_T *flp)
   int start_lvl = flp->lvl;
 
   // cache a few values for speed
-  char_u *startmarker = (char_u *)flp->wp->w_p_fmr;
-  int cstart = *startmarker;
+  char *startmarker = flp->wp->w_p_fmr;
+  int cstart = (unsigned char)(*startmarker);
   startmarker++;
-  int cend = *foldendmarker;
+  int cend = (unsigned char)(*foldendmarker);
 
   // Default: no start found, next level is same as current level
   flp->start = 0;
   flp->lvl_next = flp->lvl;
 
-  char_u *s = ml_get_buf(flp->wp->w_buffer, flp->lnum + flp->off, false);
+  char *s = (char *)ml_get_buf(flp->wp->w_buffer, flp->lnum + flp->off, false);
   while (*s) {
     if (*s == cstart
         && STRNCMP(s + 1, startmarker, foldstartmarkerlen - 1) == 0) {
       // found startmarker: set flp->lvl
       s += foldstartmarkerlen;
       if (ascii_isdigit(*s)) {
-        int n = atoi((char *)s);
+        int n = atoi(s);
         if (n > 0) {
           flp->lvl = n;
           flp->lvl_next = n;
@@ -3039,7 +3037,7 @@ static void foldlevelMarker(fline_T *flp)
       // found endmarker: set flp->lvl_next
       s += foldendmarkerlen;
       if (ascii_isdigit(*s)) {
-        int n = atoi((char *)s);
+        int n = atoi(s);
         if (n > 0) {
           flp->lvl = n;
           flp->lvl_next = n - 1;
@@ -3240,7 +3238,7 @@ void f_foldtext(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
 
   linenr_T foldstart = (linenr_T)get_vim_var_nr(VV_FOLDSTART);
   linenr_T foldend = (linenr_T)get_vim_var_nr(VV_FOLDEND);
-  char_u *dashes = (char_u *)get_vim_var_str(VV_FOLDDASHES);
+  char *dashes = get_vim_var_str(VV_FOLDDASHES);
   if (foldstart > 0 && foldend <= curbuf->b_ml.ml_line_count) {
     // Find first non-empty line in the fold.
     linenr_T lnum;
@@ -3268,20 +3266,20 @@ void f_foldtext(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
                  + STRLEN(dashes)  // for %s
                  + 20              // for %3ld
                  + STRLEN(s);      // concatenated
-    char_u *r = xmalloc(len);
-    snprintf((char *)r, len, txt, dashes, count);
+    char *r = xmalloc(len);
+    snprintf(r, len, txt, dashes, count);
     len = STRLEN(r);
     STRCAT(r, s);
     // remove 'foldmarker' and 'commentstring'
     foldtext_cleanup(r + len);
-    rettv->vval.v_string = (char *)r;
+    rettv->vval.v_string = r;
   }
 }
 
 /// "foldtextresult(lnum)" function
 void f_foldtextresult(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
 {
-  char_u buf[FOLD_TEXT_LEN];
+  char buf[FOLD_TEXT_LEN];
   static bool entered = false;
 
   rettv->v_type = VAR_STRING;
@@ -3298,11 +3296,11 @@ void f_foldtextresult(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
 
   foldinfo_T info = fold_info(curwin, lnum);
   if (info.fi_lines > 0) {
-    char_u *text = get_foldtext(curwin, lnum, lnum + info.fi_lines - 1, info, buf);
+    char *text = get_foldtext(curwin, lnum, lnum + info.fi_lines - 1, info, buf);
     if (text == buf) {
-      text = vim_strsave(text);
+      text = xstrdup(text);
     }
-    rettv->vval.v_string = (char *)text;
+    rettv->vval.v_string = text;
   }
 
   entered = false;
-- 
cgit 


From 73207cae611a1efb8cd17139e8228772daeb9866 Mon Sep 17 00:00:00 2001
From: Dundar Göc <gocdundar@gmail.com>
Date: Fri, 26 Aug 2022 23:11:25 +0200
Subject: refactor: replace char_u with char

Work on https://github.com/neovim/neovim/issues/459
---
 src/nvim/fold.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 0f085df3d0..2e8d282ede 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -1582,7 +1582,7 @@ static void foldAddMarker(buf_T *buf, pos_T pos, const char *marker, size_t mark
   linenr_T lnum = pos.lnum;
 
   // Allocate a new line: old-line + 'cms'-start + marker + 'cms'-end
-  char *line = (char *)ml_get_buf(buf, lnum, false);
+  char *line = ml_get_buf(buf, lnum, false);
   size_t line_len = STRLEN(line);
   size_t added = 0;
 
@@ -1640,7 +1640,7 @@ static void foldDelMarker(buf_T *buf, linenr_T lnum, char *marker, size_t marker
   }
 
   char *cms = buf->b_p_cms;
-  char *line = (char *)ml_get_buf(buf, lnum, false);
+  char *line = ml_get_buf(buf, lnum, false);
   for (char *p = line; *p != NUL; p++) {
     if (STRNCMP(p, marker, markerlen) != 0) {
       continue;
@@ -2848,7 +2848,7 @@ static void foldlevelIndent(fline_T *flp)
   linenr_T lnum = flp->lnum + flp->off;
 
   buf_T *buf = flp->wp->w_buffer;
-  char *s = skipwhite((char *)ml_get_buf(buf, lnum, false));
+  char *s = skipwhite(ml_get_buf(buf, lnum, false));
 
   // empty line or lines starting with a character in 'foldignore': level
   // depends on surrounding lines
@@ -3010,7 +3010,7 @@ static void foldlevelMarker(fline_T *flp)
   flp->start = 0;
   flp->lvl_next = flp->lvl;
 
-  char *s = (char *)ml_get_buf(flp->wp->w_buffer, flp->lnum + flp->off, false);
+  char *s = ml_get_buf(flp->wp->w_buffer, flp->lnum + flp->off, false);
   while (*s) {
     if (*s == cstart
         && STRNCMP(s + 1, startmarker, foldstartmarkerlen - 1) == 0) {
-- 
cgit 


From 3ff46544c9872b4161fd098569c30b55fe3abd36 Mon Sep 17 00:00:00 2001
From: Dundar Göc <gocdundar@gmail.com>
Date: Fri, 26 Aug 2022 23:11:25 +0200
Subject: refactor: replace char_u with char

Work on https://github.com/neovim/neovim/issues/459
---
 src/nvim/fold.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 2e8d282ede..d46470d413 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -996,7 +996,7 @@ void foldAdjustVisual(void)
   }
   if (hasFolding(end->lnum, NULL, &end->lnum)) {
     ptr = ml_get(end->lnum);
-    end->col = (colnr_T)STRLEN(ptr);
+    end->col = (colnr_T)strlen(ptr);
     if (end->col > 0 && *p_sel == 'o') {
       end->col--;
     }
@@ -1589,7 +1589,7 @@ static void foldAddMarker(buf_T *buf, pos_T pos, const char *marker, size_t mark
   if (u_save(lnum - 1, lnum + 1) == OK) {
     // Check if the line ends with an unclosed comment
     skip_comment(line, false, false, &line_is_comment);
-    newline = xmalloc(line_len + markerlen + STRLEN(cms) + 1);
+    newline = xmalloc(line_len + markerlen + strlen(cms) + 1);
     STRCPY(newline, line);
     // Append the marker to the end of the line
     if (p == NULL || line_is_comment) {
@@ -1599,7 +1599,7 @@ static void foldAddMarker(buf_T *buf, pos_T pos, const char *marker, size_t mark
       STRCPY(newline + line_len, cms);
       memcpy(newline + line_len + (p - cms), marker, markerlen);
       STRCPY(newline + line_len + (p - cms) + markerlen, p + 2);
-      added = markerlen + STRLEN(cms) - 2;
+      added = markerlen + strlen(cms) - 2;
     }
     ml_replace_buf(buf, lnum, newline, false);
     if (added) {
@@ -1655,14 +1655,14 @@ static void foldDelMarker(buf_T *buf, linenr_T lnum, char *marker, size_t marker
       char *cms2 = strstr(cms, "%s");
       if (p - line >= cms2 - cms
           && STRNCMP(p - (cms2 - cms), cms, cms2 - cms) == 0
-          && STRNCMP(p + len, cms2 + 2, STRLEN(cms2 + 2)) == 0) {
+          && STRNCMP(p + len, cms2 + 2, strlen(cms2 + 2)) == 0) {
         p -= cms2 - cms;
-        len += STRLEN(cms) - 2;
+        len += strlen(cms) - 2;
       }
     }
     if (u_save(lnum - 1, lnum + 1) == OK) {
       // Make new line: text-before-marker + text-after-marker
-      char *newline = xmalloc(STRLEN(line) - len + 1);
+      char *newline = xmalloc(strlen(line) - len + 1);
       assert(p >= line);
       memcpy(newline, line, (size_t)(p - line));
       STRCPY(newline + (p - line), p + len);
@@ -1789,7 +1789,7 @@ static void foldtext_cleanup(char *str)
 {
   // Ignore leading and trailing white space in 'commentstring'.
   char *cms_start = skipwhite(curbuf->b_p_cms);
-  size_t cms_slen = STRLEN(cms_start);
+  size_t cms_slen = strlen(cms_start);
   while (cms_slen > 0 && ascii_iswhite(cms_start[cms_slen - 1])) {
     cms_slen--;
   }
@@ -2985,7 +2985,7 @@ static void parseMarker(win_T *wp)
 {
   foldendmarker = vim_strchr(wp->w_p_fmr, ',');
   foldstartmarkerlen = (size_t)(foldendmarker++ - wp->w_p_fmr);
-  foldendmarkerlen = STRLEN(foldendmarker);
+  foldendmarkerlen = strlen(foldendmarker);
 }
 
 // foldlevelMarker() {{{2
@@ -3262,13 +3262,13 @@ void f_foldtext(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
     }
     int count = foldend - foldstart + 1;
     char *txt = NGETTEXT("+-%s%3ld line: ", "+-%s%3ld lines: ", count);
-    size_t len = STRLEN(txt)
-                 + STRLEN(dashes)  // for %s
+    size_t len = strlen(txt)
+                 + strlen(dashes)  // for %s
                  + 20              // for %3ld
                  + STRLEN(s);      // concatenated
     char *r = xmalloc(len);
     snprintf(r, len, txt, dashes, count);
-    len = STRLEN(r);
+    len = strlen(r);
     STRCAT(r, s);
     // remove 'foldmarker' and 'commentstring'
     foldtext_cleanup(r + len);
-- 
cgit 


From 0643645d5c9e34f7c385925b98bbcf8f64260385 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 2 Oct 2022 16:32:33 +0800
Subject: fix(folds): fix fold marker multibyte comparison (#20439)

---
 src/nvim/fold.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index d46470d413..76fc531627 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -3012,7 +3012,7 @@ static void foldlevelMarker(fline_T *flp)
 
   char *s = ml_get_buf(flp->wp->w_buffer, flp->lnum + flp->off, false);
   while (*s) {
-    if (*s == cstart
+    if ((unsigned char)(*s) == cstart
         && STRNCMP(s + 1, startmarker, foldstartmarkerlen - 1) == 0) {
       // found startmarker: set flp->lvl
       s += foldstartmarkerlen;
@@ -3032,8 +3032,8 @@ static void foldlevelMarker(fline_T *flp)
         flp->lvl_next++;
         flp->start++;
       }
-    } else if (*s == cend && STRNCMP(s + 1, foldendmarker + 1,
-                                     foldendmarkerlen - 1) == 0) {
+    } else if ((unsigned char)(*s) == cend
+               && STRNCMP(s + 1, foldendmarker + 1, foldendmarkerlen - 1) == 0) {
       // found endmarker: set flp->lvl_next
       s += foldendmarkerlen;
       if (ascii_isdigit(*s)) {
-- 
cgit 


From cfdb4cbada8c65aa57e69776bcc0f7b8b298317a Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 7 Oct 2022 09:43:16 +0800
Subject: fix: find multibyte file name in line (#20519)

And remove unnecessary unsigned casts in fold marker comparison.
---
 src/nvim/fold.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 76fc531627..1872558669 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -3002,9 +3002,9 @@ static void foldlevelMarker(fline_T *flp)
 
   // cache a few values for speed
   char *startmarker = flp->wp->w_p_fmr;
-  int cstart = (unsigned char)(*startmarker);
+  char cstart = *startmarker;
   startmarker++;
-  int cend = (unsigned char)(*foldendmarker);
+  char cend = *foldendmarker;
 
   // Default: no start found, next level is same as current level
   flp->start = 0;
@@ -3012,7 +3012,7 @@ static void foldlevelMarker(fline_T *flp)
 
   char *s = ml_get_buf(flp->wp->w_buffer, flp->lnum + flp->off, false);
   while (*s) {
-    if ((unsigned char)(*s) == cstart
+    if (*s == cstart
         && STRNCMP(s + 1, startmarker, foldstartmarkerlen - 1) == 0) {
       // found startmarker: set flp->lvl
       s += foldstartmarkerlen;
@@ -3032,7 +3032,7 @@ static void foldlevelMarker(fline_T *flp)
         flp->lvl_next++;
         flp->start++;
       }
-    } else if ((unsigned char)(*s) == cend
+    } else if (*s == cend
                && STRNCMP(s + 1, foldendmarker + 1, foldendmarkerlen - 1) == 0) {
       // found endmarker: set flp->lvl_next
       s += foldendmarkerlen;
-- 
cgit 


From 04cdea5f4ac49fa62cc4091a5c26791b80b4cc4c Mon Sep 17 00:00:00 2001
From: Dundar Göc <gocdundar@gmail.com>
Date: Fri, 26 Aug 2022 23:11:25 +0200
Subject: refactor: replace char_u with char

Work on https://github.com/neovim/neovim/issues/459
---
 src/nvim/fold.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 1872558669..04e6818d53 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -1583,7 +1583,7 @@ static void foldAddMarker(buf_T *buf, pos_T pos, const char *marker, size_t mark
 
   // Allocate a new line: old-line + 'cms'-start + marker + 'cms'-end
   char *line = ml_get_buf(buf, lnum, false);
-  size_t line_len = STRLEN(line);
+  size_t line_len = strlen(line);
   size_t added = 0;
 
   if (u_save(lnum - 1, lnum + 1) == OK) {
@@ -3249,14 +3249,14 @@ void f_foldtext(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
     }
 
     // Find interesting text in this line.
-    char_u *s = (char_u *)skipwhite(ml_get(lnum));
+    char *s = skipwhite(ml_get(lnum));
     // skip C comment-start
     if (s[0] == '/' && (s[1] == '*' || s[1] == '/')) {
-      s = (char_u *)skipwhite((char *)s + 2);
-      if (*skipwhite((char *)s) == NUL && lnum + 1 < foldend) {
-        s = (char_u *)skipwhite(ml_get(lnum + 1));
+      s = skipwhite(s + 2);
+      if (*skipwhite(s) == NUL && lnum + 1 < foldend) {
+        s = skipwhite(ml_get(lnum + 1));
         if (*s == '*') {
-          s = (char_u *)skipwhite((char *)s + 1);
+          s = skipwhite(s + 1);
         }
       }
     }
@@ -3265,7 +3265,7 @@ void f_foldtext(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
     size_t len = strlen(txt)
                  + strlen(dashes)  // for %s
                  + 20              // for %3ld
-                 + STRLEN(s);      // concatenated
+                 + strlen(s);      // concatenated
     char *r = xmalloc(len);
     snprintf(r, len, txt, dashes, count);
     len = strlen(r);
-- 
cgit 


From b05d1943f063c382ea96b76d250877bc58297314 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Tue, 1 Nov 2022 15:39:49 +0100
Subject: build(lint): remove clint.py rules for braces #20880

Uncrustify is the source of truth where possible.
Remove any redundant checks from clint.py.
See also https://github.com/neovim/neovim/pull/18563
---
 src/nvim/fold.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 04e6818d53..02fbbc20db 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -1083,7 +1083,7 @@ static int foldLevelWin(win_T *wp, linenr_T lnum)
 {
   fold_T *fp;
   linenr_T lnum_rel = lnum;
-  int level =  0;
+  int level = 0;
 
   // Recursively search for a fold that contains "lnum".
   garray_T *gap = &wp->w_folds;
-- 
cgit 


From 731cdde28ea8d48cc23ba2752a08c261c87eee92 Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Sat, 22 Oct 2022 12:36:38 +0200
Subject: refactor: fix clang-tidy warnings

Enable and fix bugprone-misplaced-widening-cast warning.

Fix some modernize-macro-to-enum and readability-else-after-return
warnings, but don't enable them. While the warnings can be useful, they
are in general too noisy to enable.
---
 src/nvim/fold.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 02fbbc20db..dd74971ab5 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -57,9 +57,11 @@ typedef struct {
                                 // folds too
 } fold_T;
 
-#define FD_OPEN         0       // fold is open (nested ones can be closed)
-#define FD_CLOSED       1       // fold is closed
-#define FD_LEVEL        2       // depends on 'foldlevel' (nested folds too)
+enum {
+  FD_OPEN = 0,    // fold is open (nested ones can be closed)
+  FD_CLOSED = 1,  // fold is closed
+  FD_LEVEL = 2,   // depends on 'foldlevel' (nested folds too)
+};
 
 #define MAX_LEVEL       20      // maximum fold depth
 
@@ -1772,7 +1774,7 @@ char *get_foldtext(win_T *wp, linenr_T lnum, linenr_T lnume, foldinfo_T foldinfo
     }
   }
   if (text == NULL) {
-    unsigned long count = (unsigned long)(lnume - lnum + 1);
+    unsigned long count = (unsigned long)(lnume - lnum + 1);  // NOLINT(bugprone-misplaced-widening-cast)
 
     vim_snprintf(buf, FOLD_TEXT_LEN,
                  NGETTEXT("+--%3ld line folded",
@@ -3115,7 +3117,7 @@ static int put_folds_recurse(FILE *fd, garray_T *gap, linenr_T off)
       return FAIL;
     }
     if (fprintf(fd, "%" PRId64 ",%" PRId64 "fold",
-                (int64_t)(fp->fd_top + off),
+                (int64_t)fp->fd_top + off,
                 (int64_t)(fp->fd_top + off + fp->fd_len - 1)) < 0
         || put_eol(fd) == FAIL) {
       return FAIL;
@@ -3136,7 +3138,7 @@ static int put_foldopen_recurse(FILE *fd, win_T *wp, garray_T *gap, linenr_T off
     if (fp->fd_flags != FD_LEVEL) {
       if (!GA_EMPTY(&fp->fd_nested)) {
         // open nested folds while this fold is open
-        if (fprintf(fd, "%" PRId64, (int64_t)(fp->fd_top + off)) < 0
+        if (fprintf(fd, "%" PRId64, (int64_t)fp->fd_top + off) < 0
             || put_eol(fd) == FAIL
             || put_line(fd, "normal! zo") == FAIL) {
           return FAIL;
-- 
cgit 


From 66360675cf4d091b7460e4a8e1435c13216c1929 Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Sun, 11 Sep 2022 17:12:44 +0200
Subject: build: allow IWYU to fix includes for all .c files

Allow Include What You Use to remove unnecessary includes and only
include what is necessary. This helps with reducing compilation times
and makes it easier to visualise which dependencies are actually
required.

Work on https://github.com/neovim/neovim/issues/549, but doesn't close
it since this only works fully for .c files and not headers.
---
 src/nvim/fold.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index dd74971ab5..940c26ad02 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -5,10 +5,15 @@
 
 // fold.c: code for folding
 
+#include <assert.h>
 #include <inttypes.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "nvim/ascii.h"
+#include "nvim/buffer_defs.h"
 #include "nvim/buffer_updates.h"
 #include "nvim/change.h"
 #include "nvim/charset.h"
@@ -16,14 +21,17 @@
 #include "nvim/diff.h"
 #include "nvim/drawscreen.h"
 #include "nvim/eval.h"
-#include "nvim/ex_docmd.h"
+#include "nvim/eval/typval.h"
+#include "nvim/eval/typval_defs.h"
 #include "nvim/ex_session.h"
 #include "nvim/extmark.h"
 #include "nvim/fold.h"
-#include "nvim/func_attr.h"
 #include "nvim/garray.h"
+#include "nvim/gettext.h"
+#include "nvim/globals.h"
 #include "nvim/indent.h"
 #include "nvim/mark.h"
+#include "nvim/mbyte.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
@@ -35,6 +43,7 @@
 #include "nvim/search.h"
 #include "nvim/strings.h"
 #include "nvim/syntax.h"
+#include "nvim/types.h"
 #include "nvim/undo.h"
 #include "nvim/vim.h"
 
-- 
cgit 


From 3b96ccf7d35be90e49029dec76344d3d92ad91dc Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Sat, 26 Nov 2022 18:57:46 +0100
Subject: refactor: replace char_u with char

Work on https://github.com/neovim/neovim/issues/459
---
 src/nvim/fold.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 940c26ad02..1ff39f3654 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -1653,7 +1653,7 @@ static void foldDelMarker(buf_T *buf, linenr_T lnum, char *marker, size_t marker
   char *cms = buf->b_p_cms;
   char *line = ml_get_buf(buf, lnum, false);
   for (char *p = line; *p != NUL; p++) {
-    if (STRNCMP(p, marker, markerlen) != 0) {
+    if (strncmp(p, marker, markerlen) != 0) {
       continue;
     }
     // Found the marker, include a digit if it's there.
@@ -1665,8 +1665,8 @@ static void foldDelMarker(buf_T *buf, linenr_T lnum, char *marker, size_t marker
       // Also delete 'commentstring' if it matches.
       char *cms2 = strstr(cms, "%s");
       if (p - line >= cms2 - cms
-          && STRNCMP(p - (cms2 - cms), cms, cms2 - cms) == 0
-          && STRNCMP(p + len, cms2 + 2, strlen(cms2 + 2)) == 0) {
+          && strncmp(p - (cms2 - cms), cms, (size_t)(cms2 - cms)) == 0
+          && strncmp(p + len, cms2 + 2, strlen(cms2 + 2)) == 0) {
         p -= cms2 - cms;
         len += strlen(cms) - 2;
       }
@@ -1829,9 +1829,9 @@ static void foldtext_cleanup(char *str)
 
   for (char *s = str; *s != NUL;) {
     size_t len = 0;
-    if (STRNCMP(s, curwin->w_p_fmr, foldstartmarkerlen) == 0) {
+    if (strncmp(s, curwin->w_p_fmr, foldstartmarkerlen) == 0) {
       len = foldstartmarkerlen;
-    } else if (STRNCMP(s, foldendmarker, foldendmarkerlen) == 0) {
+    } else if (strncmp(s, foldendmarker, foldendmarkerlen) == 0) {
       len = foldendmarkerlen;
     }
     if (len > 0) {
@@ -1844,16 +1844,16 @@ static void foldtext_cleanup(char *str)
       char *p;
       for (p = s; p > str && ascii_iswhite(p[-1]); p--) {}
       if (p >= str + cms_slen
-          && STRNCMP(p - cms_slen, cms_start, cms_slen) == 0) {
+          && strncmp(p - cms_slen, cms_start, cms_slen) == 0) {
         len += (size_t)(s - p) + cms_slen;
         s = p - cms_slen;
       }
     } else if (cms_end != NULL) {
-      if (!did1 && cms_slen > 0 && STRNCMP(s, cms_start, cms_slen) == 0) {
+      if (!did1 && cms_slen > 0 && strncmp(s, cms_start, cms_slen) == 0) {
         len = cms_slen;
         did1 = true;
       } else if (!did2 && cms_elen > 0
-                 && STRNCMP(s, cms_end, cms_elen) == 0) {
+                 && strncmp(s, cms_end, cms_elen) == 0) {
         len = cms_elen;
         did2 = true;
       }
@@ -3024,7 +3024,7 @@ static void foldlevelMarker(fline_T *flp)
   char *s = ml_get_buf(flp->wp->w_buffer, flp->lnum + flp->off, false);
   while (*s) {
     if (*s == cstart
-        && STRNCMP(s + 1, startmarker, foldstartmarkerlen - 1) == 0) {
+        && strncmp(s + 1, startmarker, foldstartmarkerlen - 1) == 0) {
       // found startmarker: set flp->lvl
       s += foldstartmarkerlen;
       if (ascii_isdigit(*s)) {
@@ -3044,7 +3044,7 @@ static void foldlevelMarker(fline_T *flp)
         flp->start++;
       }
     } else if (*s == cend
-               && STRNCMP(s + 1, foldendmarker + 1, foldendmarkerlen - 1) == 0) {
+               && strncmp(s + 1, foldendmarker + 1, foldendmarkerlen - 1) == 0) {
       // found endmarker: set flp->lvl_next
       s += foldendmarkerlen;
       if (ascii_isdigit(*s)) {
-- 
cgit 


From 6d7b94ea086e17d16e2490e56572f17031924af5 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 6 Dec 2022 11:34:20 +0800
Subject: vim-patch:8.2.4393: possible number overflow with nested folds
 (#21305)

Problem:    Possible number overflow with nested folds.
Solution:   Avoid a negative line number.

https://github.com/vim/vim/commit/6b43471da4516e8f6c17e5dc2eccbb9d0ba2e0a4

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 src/nvim/fold.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 1ff39f3654..08b963ae89 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -1436,15 +1436,13 @@ static void foldMarkAdjustRecurse(win_T *wp, garray_T *gap, linenr_T line1, line
           // 5. fold is below line1 and contains line2; need to
           // correct nested folds too
           if (amount == MAXLNUM) {
-            foldMarkAdjustRecurse(wp, &fp->fd_nested, line1 - fp->fd_top,
-                                  line2 - fp->fd_top, amount,
-                                  amount_after + (fp->fd_top - top));
+            foldMarkAdjustRecurse(wp, &fp->fd_nested, 0, line2 - fp->fd_top,
+                                  amount, amount_after + (fp->fd_top - top));
             fp->fd_len -= line2 - fp->fd_top + 1;
             fp->fd_top = line1;
           } else {
-            foldMarkAdjustRecurse(wp, &fp->fd_nested, line1 - fp->fd_top,
-                                  line2 - fp->fd_top, amount,
-                                  amount_after - amount);
+            foldMarkAdjustRecurse(wp, &fp->fd_nested, 0, line2 - fp->fd_top,
+                                  amount, amount_after - amount);
             fp->fd_len += amount_after - amount;
             fp->fd_top += amount;
           }
-- 
cgit 


From 4d860a537076d7eddfb29372ecbdacf1eb5b7d3b Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 17 Dec 2022 08:11:35 +0800
Subject: fix(folds): use long for number of folded lines (#21447)

Also remove some duplicate unsigned long casts.
---
 src/nvim/fold.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 08b963ae89..275ddc6912 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -1781,7 +1781,7 @@ char *get_foldtext(win_T *wp, linenr_T lnum, linenr_T lnume, foldinfo_T foldinfo
     }
   }
   if (text == NULL) {
-    unsigned long count = (unsigned long)(lnume - lnum + 1);  // NOLINT(bugprone-misplaced-widening-cast)
+    long count = lnume - lnum + 1;
 
     vim_snprintf(buf, FOLD_TEXT_LEN,
                  NGETTEXT("+--%3ld line folded",
@@ -3269,7 +3269,7 @@ void f_foldtext(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
         }
       }
     }
-    int count = foldend - foldstart + 1;
+    long count = foldend - foldstart + 1;
     char *txt = NGETTEXT("+-%s%3ld line: ", "+-%s%3ld lines: ", count);
     size_t len = strlen(txt)
                  + strlen(dashes)  // for %s
-- 
cgit 


From 4dd793a256fefb481159f9f93bf7572391e266de Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 3 Jan 2023 14:55:00 +0800
Subject: vim-patch:9.0.1132: code is indented more than needed (#21626)

Problem:    Code is indented more than needed.
Solution:   Use an early return to reduce indentation. (Yegappan Lakshmanan,
            closes vim/vim#11769)

https://github.com/vim/vim/commit/dc4daa3a3915fba11ac87d27977240d9a5e0d47d

Omit expand_autoload_callback(): only applies to Vim9 script.

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 src/nvim/fold.c | 72 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 34 deletions(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 275ddc6912..6d85206d18 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -1523,23 +1523,25 @@ static bool check_closed(win_T *const wp, fold_T *const fp, bool *const use_leve
 /// @param lnum_off  offset for fp->fd_top
 static void checkSmall(win_T *const wp, fold_T *const fp, const linenr_T lnum_off)
 {
-  if (fp->fd_small == kNone) {
-    // Mark any nested folds to maybe-small
-    setSmallMaybe(&fp->fd_nested);
+  if (fp->fd_small != kNone) {
+    return;
+  }
 
-    if (fp->fd_len > wp->w_p_fml) {
-      fp->fd_small = kFalse;
-    } else {
-      int count = 0;
-      for (int n = 0; n < fp->fd_len; n++) {
-        count += plines_win_nofold(wp, fp->fd_top + lnum_off + n);
-        if (count > wp->w_p_fml) {
-          fp->fd_small = kFalse;
-          return;
-        }
+  // Mark any nested folds to maybe-small
+  setSmallMaybe(&fp->fd_nested);
+
+  if (fp->fd_len > wp->w_p_fml) {
+    fp->fd_small = kFalse;
+  } else {
+    int count = 0;
+    for (int n = 0; n < fp->fd_len; n++) {
+      count += plines_win_nofold(wp, fp->fd_top + lnum_off + n);
+      if (count > wp->w_p_fml) {
+        fp->fd_small = kFalse;
+        return;
       }
-      fp->fd_small = kTrue;
     }
+    fp->fd_small = kTrue;
   }
 }
 
@@ -1595,26 +1597,28 @@ static void foldAddMarker(buf_T *buf, pos_T pos, const char *marker, size_t mark
   size_t line_len = strlen(line);
   size_t added = 0;
 
-  if (u_save(lnum - 1, lnum + 1) == OK) {
-    // Check if the line ends with an unclosed comment
-    skip_comment(line, false, false, &line_is_comment);
-    newline = xmalloc(line_len + markerlen + strlen(cms) + 1);
-    STRCPY(newline, line);
-    // Append the marker to the end of the line
-    if (p == NULL || line_is_comment) {
-      STRLCPY(newline + line_len, marker, markerlen + 1);
-      added = markerlen;
-    } else {
-      STRCPY(newline + line_len, cms);
-      memcpy(newline + line_len + (p - cms), marker, markerlen);
-      STRCPY(newline + line_len + (p - cms) + markerlen, p + 2);
-      added = markerlen + strlen(cms) - 2;
-    }
-    ml_replace_buf(buf, lnum, newline, false);
-    if (added) {
-      extmark_splice_cols(buf, (int)lnum - 1, (int)line_len,
-                          0, (int)added, kExtmarkUndo);
-    }
+  if (u_save(lnum - 1, lnum + 1) != OK) {
+    return;
+  }
+
+  // Check if the line ends with an unclosed comment
+  skip_comment(line, false, false, &line_is_comment);
+  newline = xmalloc(line_len + markerlen + strlen(cms) + 1);
+  STRCPY(newline, line);
+  // Append the marker to the end of the line
+  if (p == NULL || line_is_comment) {
+    STRLCPY(newline + line_len, marker, markerlen + 1);
+    added = markerlen;
+  } else {
+    STRCPY(newline + line_len, cms);
+    memcpy(newline + line_len + (p - cms), marker, markerlen);
+    STRCPY(newline + line_len + (p - cms) + markerlen, p + 2);
+    added = markerlen + strlen(cms) - 2;
+  }
+  ml_replace_buf(buf, lnum, newline, false);
+  if (added) {
+    extmark_splice_cols(buf, (int)lnum - 1, (int)line_len,
+                        0, (int)added, kExtmarkUndo);
   }
 }
 
-- 
cgit 


From a174f4e53f0e111653e10d2df8aebe7c9fa0f73e Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 9 Jan 2023 07:16:36 +0800
Subject: vim-patch:9.0.1158: code is indented more than necessary (#21697)

Problem:    Code is indented more than necessary.
Solution:   Use an early return where it makes sense. (Yegappan Lakshmanan,
            closes vim/vim#11787)

https://github.com/vim/vim/commit/7f8b2559a30e2e2a443c35b28e94c6b45ba7ae04

Omit reset_last_used_map(): only used in Vim9 script.

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 src/nvim/fold.c | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 6d85206d18..8b773b2eee 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -477,12 +477,15 @@ static void newFoldLevelWin(win_T *wp)
 /// Apply 'foldlevel' to all folds that don't contain the cursor.
 void foldCheckClose(void)
 {
-  if (*p_fcl != NUL) {  // can only be "all" right now
-    checkupdate(curwin);
-    if (checkCloseRec(&curwin->w_folds, curwin->w_cursor.lnum,
-                      (int)curwin->w_p_fdl)) {
-      changed_window_setting();
-    }
+  if (*p_fcl == NUL) {
+    return;
+  }
+
+  // can only be "all" right now
+  checkupdate(curwin);
+  if (checkCloseRec(&curwin->w_folds, curwin->w_cursor.lnum,
+                    (int)curwin->w_p_fdl)) {
+    changed_window_setting();
   }
 }
 
@@ -1005,15 +1008,18 @@ void foldAdjustVisual(void)
   if (hasFolding(start->lnum, &start->lnum, NULL)) {
     start->col = 0;
   }
-  if (hasFolding(end->lnum, NULL, &end->lnum)) {
-    ptr = ml_get(end->lnum);
-    end->col = (colnr_T)strlen(ptr);
-    if (end->col > 0 && *p_sel == 'o') {
-      end->col--;
-    }
-    // prevent cursor from moving on the trail byte
-    mb_adjust_cursor();
+
+  if (!hasFolding(end->lnum, NULL, &end->lnum)) {
+    return;
+  }
+
+  ptr = ml_get(end->lnum);
+  end->col = (colnr_T)strlen(ptr);
+  if (end->col > 0 && *p_sel == 'o') {
+    end->col--;
   }
+  // prevent cursor from moving on the trail byte
+  mb_adjust_cursor();
 }
 
 // cursor_foldstart() {{{2
@@ -1115,10 +1121,12 @@ static int foldLevelWin(win_T *wp, linenr_T lnum)
 /// Check if the folds in window "wp" are invalid and update them if needed.
 static void checkupdate(win_T *wp)
 {
-  if (wp->w_foldinvalid) {
-    foldUpdate(wp, (linenr_T)1, (linenr_T)MAXLNUM);     // will update all
-    wp->w_foldinvalid = false;
+  if (!wp->w_foldinvalid) {
+    return;
   }
+
+  foldUpdate(wp, (linenr_T)1, (linenr_T)MAXLNUM);     // will update all
+  wp->w_foldinvalid = false;
 }
 
 // setFoldRepeat() {{{2
-- 
cgit 


From 149209400383c673fdb4fdd1c9a7639139f17936 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Mon, 9 Jan 2023 14:13:06 +0100
Subject: refactor: replace char_u with char 17 - remove STRLCPY (#21235)

refactor: replace char_u with char

Work on https://github.com/neovim/neovim/issues/459
---
 src/nvim/fold.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 8b773b2eee..4ac96cdfd2 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -1615,7 +1615,7 @@ static void foldAddMarker(buf_T *buf, pos_T pos, const char *marker, size_t mark
   STRCPY(newline, line);
   // Append the marker to the end of the line
   if (p == NULL || line_is_comment) {
-    STRLCPY(newline + line_len, marker, markerlen + 1);
+    xstrlcpy(newline + line_len, marker, markerlen + 1);
     added = markerlen;
   } else {
     STRCPY(newline + line_len, cms);
-- 
cgit 


From dc7edce650bc2abbcad2fdc12cb77561b36b35af Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 10 Jan 2023 08:46:42 +0800
Subject: vim-patch:partial:9.0.1166: code is indented more than necessary
 (#21716)

Problem:    Code is indented more than necessary.
Solution:   Use an early return where it makes sense. (Yegappan Lakshmanan,
            closes vim/vim#11792)

https://github.com/vim/vim/commit/1cfb14aa972ccf3235ac67f07b7db1175b7c5384

Partial port as some highlight.c changes depend on previous patches.
Cherry-pick fname_match() change from patch 8.2.4959.
Omit internal_func_check_arg_types(): only used for Vim9 script.

N/A patches for version.c:

vim-patch:9.0.1167: EditorConfig files do not have their own filetype

Problem:    EditorConfig files do not have their own filetype.
Solution:   Add the "editorconfig" filetype. (Gregory Anders, closes vim/vim#11779)

https://github.com/vim/vim/commit/d41262ed06564cef98a3800e2928e6e0db91abbf

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 src/nvim/fold.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 4ac96cdfd2..6cb9e5c38d 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -481,7 +481,7 @@ void foldCheckClose(void)
     return;
   }
 
-  // can only be "all" right now
+  // 'foldclose' can only be "all" right now
   checkupdate(curwin);
   if (checkCloseRec(&curwin->w_folds, curwin->w_cursor.lnum,
                     (int)curwin->w_p_fdl)) {
-- 
cgit 


From 0344bfad0fc87d2e256ea2b80de7abd069ba1dd2 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Tue, 17 Jan 2023 14:17:40 +0100
Subject: refactor: replace char_u with char 22 (#21786)

Work on https://github.com/neovim/neovim/issues/459
---
 src/nvim/fold.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/fold.c')

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 6cb9e5c38d..7306131574 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -2873,7 +2873,7 @@ static void foldlevelIndent(fline_T *flp)
 
   // empty line or lines starting with a character in 'foldignore': level
   // depends on surrounding lines
-  if (*s == NUL || vim_strchr(flp->wp->w_p_fdi, *s) != NULL) {
+  if (*s == NUL || vim_strchr(flp->wp->w_p_fdi, (uint8_t)(*s)) != NULL) {
     // first and last line can't be undefined, use level 0
     if (lnum == 1 || lnum == buf->b_ml.ml_line_count) {
       flp->lvl = 0;
-- 
cgit