Merge pull request #15930 from dundargoc/vim-patch/old-style-c-comments

vim-patch:8.1.2396,8.1.2395,8.1.2394,8.1.2392,8.1.2368,8.1.2388,8.1.2379

src/nvim/buffer.c

@@ -526,8 +526,8 @@ bool close_buffer(win_T *win, buf_T *buf, int action, bool abort_if_last)
     diff_buf_delete(buf);   // Clear 'diff' for hidden buffer.
   }
 
-  /* Return when a window is displaying the buffer or when it's not
+  // Return when a window is displaying the buffer or when it's not
-   * unloaded. */
+  // unloaded.
   if (buf->b_nwindows > 0 || !unload_buf) {
     return false;
   }
@@ -1591,8 +1591,8 @@ void enter_buffer(buf_T *buf)
     apply_autocmds(EVENT_BUFWINENTER, NULL, NULL, false, curbuf);
   }
 
-  /* If autocommands did not change the cursor position, restore cursor lnum
+  // If autocommands did not change the cursor position, restore cursor lnum
-   * and possibly cursor col. */
+  // and possibly cursor col.
   if (curwin->w_cursor.lnum == 1 && inindent(0)) {
     buflist_getfpos();
   }
@@ -1754,8 +1754,8 @@ buf_T *buflist_new(char_u *ffname_arg, char_u *sfname_arg, linenr_T lnum, int fl
   if ((flags & BLN_CURBUF) && curbuf_reusable()) {
     assert(curbuf != NULL);
     buf = curbuf;
-    /* It's like this buffer is deleted.  Watch out for autocommands that
+    // It's like this buffer is deleted.  Watch out for autocommands that
-     * change curbuf!  If that happens, allocate a new buffer anyway. */
+    // change curbuf!  If that happens, allocate a new buffer anyway.
     if (curbuf->b_p_bl) {
       apply_autocmds(EVENT_BUFDELETE, NULL, NULL, false, curbuf);
     }
@@ -2257,8 +2257,8 @@ int buflist_findpat(const char_u *pattern, const char_u *pattern_end, bool unlis
         }
       }
 
-      /* Only search for unlisted buffers if there was no match with
+      // Only search for unlisted buffers if there was no match with
-       * a listed buffer. */
+      // a listed buffer.
       if (!unlisted || !find_listed || match != -1) {
         break;
       }
@@ -2893,8 +2893,8 @@ void buf_set_name(int fnum, char_u *name)
     xfree(buf->b_ffname);
     buf->b_ffname = vim_strsave(name);
     buf->b_sfname = NULL;
-    /* Allocate ffname and expand into full path.  Also resolves .lnk
+    // Allocate ffname and expand into full path.  Also resolves .lnk
-     * files on Win32. */
+    // files on Win32.
     fname_expand(buf, &buf->b_ffname, &buf->b_sfname);
     buf->b_fname = buf->b_sfname;
   }
@@ -3166,8 +3166,8 @@ void fileinfo(int fullname, int shorthelp, int dont_truncate)
   (void)append_arg_number(curwin, buffer, IOSIZE, !shortmess(SHM_FILE));
 
   if (dont_truncate) {
-    /* Temporarily set msg_scroll to avoid the message being truncated.
+    // Temporarily set msg_scroll to avoid the message being truncated.
-     * First call msg_start() to get the message in the right place. */
+    // First call msg_start() to get the message in the right place.
     msg_start();
     n = msg_scroll;
     msg_scroll = true;
@@ -5233,8 +5233,8 @@ void do_modelines(int flags)
     return;
   }
 
-  /* Disallow recursive entry here.  Can happen when executing a modeline
+  // Disallow recursive entry here.  Can happen when executing a modeline
-   * triggers an autocommand, which reloads modelines with a ":do". */
+  // triggers an autocommand, which reloads modelines with a ":do".
   if (entered) {
     return;
   }

src/nvim/eval/userfunc.c

@@ -1709,8 +1709,8 @@ char_u *trans_function_name(char_u **pp, bool skip,                     // only
   }
   start = *pp;
 
-  /* Check for hard coded <SNR>: already translated function ID (from a user
+  // Check for hard coded <SNR>: already translated function ID (from a user
-   * command). */
+  // command).
   if ((*pp)[0] == K_SPECIAL && (*pp)[1] == KS_EXTRA
       && (*pp)[2] == (int)KE_SNR) {
     *pp += 3;
@@ -2032,8 +2032,8 @@ void ex_function(exarg_T *eap)
     }
   }
 
-  /* An error in a function call during evaluation of an expression in magic
+  // An error in a function call during evaluation of an expression in magic
-   * braces should not cause the function not to be defined. */
+  // braces should not cause the function not to be defined.
   saved_did_emsg = did_emsg;
   did_emsg = FALSE;
 
@@ -2105,8 +2105,8 @@ void ex_function(exarg_T *eap)
   ga_init(&newlines, (int)sizeof(char_u *), 3);
 
   if (!eap->skip) {
-    /* Check the name of the function.  Unless it's a dictionary function
+    // Check the name of the function.  Unless it's a dictionary function
-     * (that we are overwriting). */
+    // (that we are overwriting).
     if (name != NULL) {
       arg = name;
     } else {
@@ -2164,8 +2164,8 @@ void ex_function(exarg_T *eap)
     }
   }
 
-  /* When there is a line break use what follows for the function body.
+  // When there is a line break use what follows for the function body.
-   * Makes 'exe "func Test()\n...\nendfunc"' work. */
+  // Makes 'exe "func Test()\n...\nendfunc"' work.
   if (*p == '\n') {
     line_arg = p + 1;
   } else if (*p != NUL && *p != '"' && !eap->skip && !did_emsg) {
@@ -2176,9 +2176,9 @@ void ex_function(exarg_T *eap)
    * Read the body of the function, until ":endfunction" is found.
    */
   if (KeyTyped) {
-    /* Check if the function already exists, don't let the user type the
+    // Check if the function already exists, don't let the user type the
-     * whole function before telling him it doesn't work!  For a script we
+    // whole function before telling him it doesn't work!  For a script we
-     * need to skip the body to be able to find what follows. */
+    // need to skip the body to be able to find what follows.
     if (!eap->skip && !eap->forceit) {
       if (fudi.fd_dict != NULL && fudi.fd_newkey == NULL) {
         EMSG(_(e_funcdict));
@@ -2305,8 +2305,8 @@ void ex_function(exarg_T *eap)
         break;
       }
 
-      /* Increase indent inside "if", "while", "for" and "try", decrease
+      // Increase indent inside "if", "while", "for" and "try", decrease
-       * at "end". */
+      // at "end".
       if (indent > 2 && STRNCMP(p, "end", 3) == 0) {
         indent -= 2;
       } else if (STRNCMP(p, "if", 2) == 0
@@ -2421,8 +2421,8 @@ void ex_function(exarg_T *eap)
     }
   }
 
-  /* Don't define the function when skipping commands or when an error was
+  // Don't define the function when skipping commands or when an error was
-   * detected. */
+  // detected.
   if (eap->skip || did_emsg) {
     goto erret;
   }
@@ -2640,8 +2640,8 @@ bool function_exists(const char *const name, bool no_deref)
                                               NULL);
   nm = skipwhite(nm);
 
-  /* Only accept "funcname", "funcname ", "funcname (..." and
+  // Only accept "funcname", "funcname ", "funcname (..." and
-   * "funcname(...", not "funcname!...". */
+  // "funcname(...", not "funcname!...".
   if (p != NULL && (*nm == NUL || *nm == '(')) {
     n = translated_function_exists(p);
   }
@@ -2903,9 +2903,9 @@ void ex_return(exarg_T *eap)
     }
   }
 
-  /* When skipping or the return gets pending, advance to the next command
+  // When skipping or the return gets pending, advance to the next command
-   * in this line (!returning).  Otherwise, ignore the rest of the line.
+  // in this line (!returning).  Otherwise, ignore the rest of the line.
-   * Following lines will be ignored by get_func_line(). */
+  // Following lines will be ignored by get_func_line().
   if (returning) {
     eap->nextcmd = NULL;
   } else if (eap->nextcmd == NULL) {          // no argument
@@ -3098,9 +3098,9 @@ int do_return(exarg_T *eap, int reanimate, int is_cmd, void *rettv)
       }
 
       if (reanimate) {
-        /* The pending return value could be overwritten by a ":return"
+        // The pending return value could be overwritten by a ":return"
-         * without argument in a finally clause; reset the default
+        // without argument in a finally clause; reset the default
-         * return value. */
+        // return value.
         current_funccal->rettv->v_type = VAR_NUMBER;
         current_funccal->rettv->vval.v_number = 0;
       }
@@ -3109,9 +3109,9 @@ int do_return(exarg_T *eap, int reanimate, int is_cmd, void *rettv)
   } else {
     current_funccal->returned = TRUE;
 
-    /* If the return is carried out now, store the return value.  For
+    // If the return is carried out now, store the return value.  For
-     * a return immediately after reanimation, the value is already
+    // a return immediately after reanimation, the value is already
-     * there. */
+    // there.
     if (!reanimate && rettv != NULL) {
       tv_clear(current_funccal->rettv);
       *current_funccal->rettv = *(typval_T *)rettv;

src/nvim/ex_cmds.c

@@ -361,8 +361,8 @@ static int linelen(int *has_tab)
   return len;
 }
 
-/* Buffer for two lines used during sorting.  They are allocated to
+// Buffer for two lines used during sorting.  They are allocated to
- * contain the longest line being sorted. */
+// contain the longest line being sorted.
 static char_u *sortbuf1;
 static char_u *sortbuf2;
 
@@ -404,9 +404,9 @@ static int sort_compare(const void *s1, const void *s2)
   sorti_T l2 = *(sorti_T *)s2;
   int result = 0;
 
-  /* If the user interrupts, there's no way to stop qsort() immediately, but
+  // If the user interrupts, there's no way to stop qsort() immediately, but
-   * if we return 0 every time, qsort will assume it's done sorting and
+  // if we return 0 every time, qsort will assume it's done sorting and
-   * exit. */
+  // exit.
   if (sort_abort) {
     return 0;
   }
@@ -1733,8 +1733,8 @@ int rename_buffer(char_u *new_fname)
  */
 void ex_file(exarg_T *eap)
 {
-  /* ":0file" removes the file name.  Check for illegal uses ":3file",
+  // ":0file" removes the file name.  Check for illegal uses ":3file",
-   * "0file name", etc. */
+  // "0file name", etc.
   if (eap->addr_count > 0
       && (*eap->arg != NUL
           || eap->line2 > 0
@@ -1888,11 +1888,11 @@ int do_write(exarg_T *eap)
         retval = FAIL;
         goto theend;
       }
-      /* Exchange the file names for the current and the alternate
+      // Exchange the file names for the current and the alternate
-       * buffer.  This makes it look like we are now editing the buffer
+      // buffer.  This makes it look like we are now editing the buffer
-       * under the new name.  Must be done before buf_write(), because
+      // under the new name.  Must be done before buf_write(), because
-       * if there is no file name and 'cpo' contains 'F', it will set
+      // if there is no file name and 'cpo' contains 'F', it will set
-       * the file name. */
+      // the file name.
       fname = alt_buf->b_fname;
       alt_buf->b_fname = curbuf->b_fname;
       curbuf->b_fname = fname;
@@ -1923,8 +1923,8 @@ int do_write(exarg_T *eap)
         do_modelines(0);
       }
 
-      /* Autocommands may have changed buffer names, esp. when
+      // Autocommands may have changed buffer names, esp. when
-       * 'autochdir' is set. */
+      // 'autochdir' is set.
       fname = curbuf->b_sfname;
     }
 
@@ -2003,11 +2003,11 @@ int check_overwrite(exarg_T *eap, buf_T *buf, char_u *fname, char_u *ffname, int
       char_u *p;
       char_u *swapname;
 
-      /* We only try the first entry in 'directory', without checking if
+      // We only try the first entry in 'directory', without checking if
-       * it's writable.  If the "." directory is not writable the write
+      // it's writable.  If the "." directory is not writable the write
-       * will probably fail anyway.
+      // will probably fail anyway.
-       * Use 'shortname' of the current buffer, since there is no buffer
+      // Use 'shortname' of the current buffer, since there is no buffer
-       * for the written file. */
+      // for the written file.
       if (*p_dir == NUL) {
         dir = xmalloc(5);
         STRCPY(dir, ".");
@@ -2466,8 +2466,8 @@ int do_ecmd(int fnum, char_u *ffname, char_u *sfname, exarg_T *eap, linenr_T new
       }
     }
 
-    /* May jump to last used line number for a loaded buffer or when asked
+    // May jump to last used line number for a loaded buffer or when asked
-     * for explicitly */
+    // for explicitly
     if ((oldbuf && newlnum == ECMD_LASTL) || newlnum == ECMD_LAST) {
       pos = buflist_findfpos(buf);
       newlnum = pos->lnum;
@@ -2577,10 +2577,10 @@ int do_ecmd(int fnum, char_u *ffname, char_u *sfname, exarg_T *eap, linenr_T new
           }
         }
 
-        /* May get the window options from the last time this buffer
+        // May get the window options from the last time this buffer
-         * was in this window (or another window).  If not used
+        // was in this window (or another window).  If not used
-         * before, reset the local window options to the global
+        // before, reset the local window options to the global
-         * values.  Also restores old folding stuff. */
+        // values.  Also restores old folding stuff.
         get_winopts(curbuf);
         did_get_winopts = true;
       }
@@ -2621,10 +2621,10 @@ int do_ecmd(int fnum, char_u *ffname, char_u *sfname, exarg_T *eap, linenr_T new
     goto theend;
   }
 
-  /* Since we are starting to edit a file, consider the filetype to be
+  // Since we are starting to edit a file, consider the filetype to be
-   * unset.  Helps for when an autocommand changes files and expects syntax
+  // unset.  Helps for when an autocommand changes files and expects syntax
-   * highlighting to work in the other file. */
+  // highlighting to work in the other file.
-  did_filetype = FALSE;
+  did_filetype = false;
 
   /*
    * other_file oldbuf
@@ -2828,8 +2828,8 @@ int do_ecmd(int fnum, char_u *ffname, char_u *sfname, exarg_T *eap, linenr_T new
       && !auto_buf) {
     int msg_scroll_save = msg_scroll;
 
-    /* Obey the 'O' flag in 'cpoptions': overwrite any previous file
+    // Obey the 'O' flag in 'cpoptions': overwrite any previous file
-     * message. */
+    // message.
     if (shortmess(SHM_OVERALL) && !exiting && p_verbose == 0) {
       msg_scroll = FALSE;
     }
@@ -2953,8 +2953,8 @@ void ex_append(exarg_T *eap)
       }
     }
     if (eap->getline == NULL) {
-      /* No getline() function, use the lines that follow. This ends
+      // No getline() function, use the lines that follow. This ends
-       * when there is no more. */
+      // when there is no more.
       if (eap->nextcmd == NULL || *eap->nextcmd == NUL) {
         break;
       }
@@ -3750,8 +3750,8 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout, bool do_buf_event, handle
           sub_firstline = vim_strsave(ml_get(sub_firstlnum));
         }
 
-        /* Save the line number of the last change for the final
+        // Save the line number of the last change for the final
-         * cursor position (just like Vi). */
+        // cursor position (just like Vi).
         curwin->w_cursor.lnum = lnum;
         do_again = FALSE;
 
@@ -3778,8 +3778,8 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout, bool do_buf_event, handle
           goto skip;
         }
 
-        /* Normally we continue searching for a match just after the
+        // Normally we continue searching for a match just after the
-         * previous match. */
+        // previous match.
         matchcol = regmatch.endpos[0].col;
         prev_matchcol = matchcol;
 
@@ -3818,8 +3818,8 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout, bool do_buf_event, handle
             do_check_cursorbind();
           }
 
-          /* When 'cpoptions' contains "u" don't sync undo when
+          // When 'cpoptions' contains "u" don't sync undo when
-           * asking for confirmation. */
+          // asking for confirmation.
           if (vim_strchr(p_cpo, CPO_UNDO) != NULL) {
             ++no_u_sync;
           }
@@ -3970,11 +3970,11 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout, bool do_buf_event, handle
           }
 
           if (typed == 'n') {
-            /* For a multi-line match, put matchcol at the NUL at
+            // For a multi-line match, put matchcol at the NUL at
-             * the end of the line and set nmatch to one, so that
+            // the end of the line and set nmatch to one, so that
-             * we continue looking for a match on the next line.
+            // we continue looking for a match on the next line.
-             * Avoids that ":%s/\nB\@=//gc" and ":%s/\n/,\r/gc"
+            // Avoids that ":%s/\nB\@=//gc" and ":%s/\n/,\r/gc"
-             * get stuck when pressing 'n'. */
+            // get stuck when pressing 'n'.
             if (nmatch > 1) {
               matchcol = (colnr_T)STRLEN(sub_firstline);
               skip_match = true;
@@ -3986,8 +3986,8 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout, bool do_buf_event, handle
           }
         }
 
-        /* Move the cursor to the start of the match, so that we can
+        // Move the cursor to the start of the match, so that we can
-         * use "\=col("."). */
+        // use "\=col(".").
         curwin->w_cursor.col = regmatch.startpos[0].col;
 
         // When the match included the "$" of the last line it may
@@ -4178,11 +4178,11 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout, bool do_buf_event, handle
         // strings, e.g. :s/$/pat/g or :s/[a-z]* /(&)/g.
         // But ":s/\n/#/" is OK.
 skip:
-        /* We already know that we did the last subst when we are at
+        // We already know that we did the last subst when we are at
-         * the end of the line, except that a pattern like
+        // the end of the line, except that a pattern like
-         * "bar\|\nfoo" may match at the NUL.  "lnum" can be below
+        // "bar\|\nfoo" may match at the NUL.  "lnum" can be below
-         * "line2" when there is a \zs in the pattern after a line
+        // "line2" when there is a \zs in the pattern after a line
-         * break. */
+        // break.
         lastone = (skip_match
                    || got_int
                    || got_quit
@@ -4249,8 +4249,8 @@ skip:
               nmatch_tl = 0;
             }
 
-            /* When asking, undo is saved each time, must also set
+            // When asking, undo is saved each time, must also set
-             * changed flag each time. */
+            // changed flag each time.
             if (subflags.do_ask) {
               changed_bytes(lnum, 0);
             } else {
@@ -4278,9 +4278,9 @@ skip:
            * 5. break if there isn't another match in this line
            */
           if (nmatch <= 0) {
-            /* If the match found didn't start where we were
+            // If the match found didn't start where we were
-             * searching, do the next search in the line where we
+            // searching, do the next search in the line where we
-             * found the match. */
+            // found the match.
             if (nmatch == -1) {
               lnum -= regmatch.startpos[0].lnum;
             }
@@ -4329,9 +4329,9 @@ skip:
   curbuf->deleted_bytes2 = 0;
 
   if (first_line != 0) {
-    /* Need to subtract the number of added lines from "last_line" to get
+    // Need to subtract the number of added lines from "last_line" to get
-     * the line number before the change (same as adding the number of
+    // the line number before the change (same as adding the number of
-     * deleted lines). */
+    // deleted lines).
     i = curbuf->b_ml.ml_line_count - old_line_count;
     changed_lines(first_line, 0, last_line - i, i, false);
 
@@ -4842,9 +4842,9 @@ void ex_help(exarg_T *eap)
       }
       fclose(helpfd);
 
-      /* Split off help window; put it at far top if no position
+      // Split off help window; put it at far top if no position
-       * specified, the current window is vertically split and
+      // specified, the current window is vertically split and
-       * narrow. */
+      // narrow.
       n = WSP_HELP;
       if (cmdmod.split == 0 && curwin->w_width != Columns
           && curwin->w_width < 80) {
@@ -4884,9 +4884,9 @@ void ex_help(exarg_T *eap)
 
   do_tag(tag, DT_HELP, 1, FALSE, TRUE);
 
-  /* Delete the empty buffer if we're not using it.  Careful: autocommands
+  // Delete the empty buffer if we're not using it.  Careful: autocommands
-   * may have jumped to another window, check that the buffer is not in a
+  // may have jumped to another window, check that the buffer is not in a
-   * window. */
+  // window.
   if (empty_fnum != 0 && curbuf->b_fnum != empty_fnum) {
     buf = buflist_findnr(empty_fnum);
     if (buf != NULL && buf->b_nwindows == 0) {
@@ -5057,11 +5057,11 @@ int find_help_tags(const char_u *arg, int *num_matches, char_u ***matches, bool
   }
 
   if (i < 0) {  // no match in table
-    /* Replace "\S" with "/\\S", etc.  Otherwise every tag is matched.
+    // Replace "\S" with "/\\S", etc.  Otherwise every tag is matched.
-     * Also replace "\%^" and "\%(", they match every tag too.
+    // Also replace "\%^" and "\%(", they match every tag too.
-     * Also "\zs", "\z1", etc.
+    // Also "\zs", "\z1", etc.
-     * Also "\@<", "\@=", "\@<=", etc.
+    // Also "\@<", "\@=", "\@<=", etc.
-     * And also "\_$" and "\_^". */
+    // And also "\_$" and "\_^".
     if (arg[0] == '\\'
         && ((arg[1] != NUL && arg[2] == NUL)
             || (vim_strchr((char_u *)"%_z@", arg[1]) != NULL
@@ -5158,8 +5158,8 @@ int find_help_tags(const char_u *arg, int *num_matches, char_u ***matches, bool
           *d++ = '\\';
         }
 
-        /* "CTRL-\_" -> "CTRL-\\_" to avoid the special meaning of "\_" in
+        // "CTRL-\_" -> "CTRL-\\_" to avoid the special meaning of "\_" in
-         * "CTRL-\_CTRL-N" */
+        // "CTRL-\_CTRL-N"
         if (STRNICMP(s, "CTRL-\\_", 7) == 0) {
           STRCPY(d, "CTRL-\\\\");
           d += 7;
@@ -5213,9 +5213,9 @@ int find_help_tags(const char_u *arg, int *num_matches, char_u ***matches, bool
   }
   if (find_tags(IObuff, num_matches, matches, flags, MAXCOL, NULL) == OK
       && *num_matches > 0) {
-    /* Sort the matches found on the heuristic number that is after the
+    // Sort the matches found on the heuristic number that is after the
-     * tag name. */
+    // tag name.
-    qsort((void *)*matches, (size_t)*num_matches,
+    qsort((void *)(*matches), (size_t)(*num_matches),
           sizeof(char_u *), help_compare);
     // Delete more than TAG_MANY to reduce the size of the listing.
     while (*num_matches > TAG_MANY) {

src/nvim/ex_docmd.c

@@ -197,8 +197,8 @@ void do_exmode(void)
   exmode_active = true;
   State = NORMAL;
 
-  /* When using ":global /pat/ visual" and then "Q" we return to continue
+  // When using ":global /pat/ visual" and then "Q" we return to continue
-   * the :global command. */
+  // the :global command.
   if (global_busy) {
     return;
   }
@@ -231,8 +231,8 @@ void do_exmode(void)
         EMSG(_(e_emptybuf));
       } else {
         if (ex_pressedreturn) {
-          /* go up one line, to overwrite the ":<CR>" line, so the
+          // go up one line, to overwrite the ":<CR>" line, so the
-           * output doesn't contain empty lines. */
+          // output doesn't contain empty lines.
           msg_row = prev_msg_row;
           if (prev_msg_row == Rows - 1) {
             msg_row--;
@@ -374,8 +374,8 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline, void *cookie, int flags)
     ++ex_nesting_level;
   }
 
-  /* Get the function or script name and the address where the next breakpoint
+  // Get the function or script name and the address where the next breakpoint
-   * line and the debug tick for a function or script are stored. */
+  // line and the debug tick for a function or script are stored.
   if (getline_is_func) {
     fname = func_name(real_cookie);
     breakpoint = func_breakpoint(real_cookie);
@@ -500,11 +500,11 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline, void *cookie, int flags)
     }
 
     if (cstack.cs_looplevel > 0) {
-      /* Inside a while/for loop we need to store the lines and use them
+      // Inside a while/for loop we need to store the lines and use them
-       * again.  Pass a different "fgetline" function to do_one_cmd()
+      // again.  Pass a different "fgetline" function to do_one_cmd()
-       * below, so that it stores lines in or reads them from
+      // below, so that it stores lines in or reads them from
-       * "lines_ga".  Makes it possible to define a function inside a
+      // "lines_ga".  Makes it possible to define a function inside a
-       * while/for loop. */
+      // while/for loop.
       cmd_getline = get_loop_line;
       cmd_cookie = (void *)&cmd_loop_cookie;
       cmd_loop_cookie.lines_gap = &lines_ga;
@@ -612,8 +612,8 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline, void *cookie, int flags)
     }
 
     if (cmd_cookie == (void *)&cmd_loop_cookie) {
-      /* Use "current_line" from "cmd_loop_cookie", it may have been
+      // Use "current_line" from "cmd_loop_cookie", it may have been
-       * incremented when defining a function. */
+      // incremented when defining a function.
       current_line = cmd_loop_cookie.current_line;
     }
 
@@ -671,8 +671,8 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline, void *cookie, int flags)
           cstack.cs_lflags |= CSL_HAD_LOOP;
           line_breakcheck();                    // check if CTRL-C typed
 
-          /* Check for the next breakpoint at or after the ":while"
+          // Check for the next breakpoint at or after the ":while"
-           * or ":for". */
+          // or ":for".
           if (breakpoint != NULL) {
             *breakpoint = dbg_find_breakpoint(getline_equal(fgetline, cookie, getsourceline),
                                               fname,
@@ -724,8 +724,8 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline, void *cookie, int flags)
       cstack.cs_flags[cstack.cs_idx] |= CSF_ACTIVE | CSF_FINALLY;
     }
 
-    /* Update global "trylevel" for recursive calls to do_cmdline() from
+    // Update global "trylevel" for recursive calls to do_cmdline() from
-     * within this loop. */
+    // within this loop.
     trylevel = initial_trylevel + cstack.cs_trylevel;
 
     // If the outermost try conditional (across function calls and sourced
@@ -806,9 +806,9 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline, void *cookie, int flags)
     trylevel = initial_trylevel;
   }
 
-  /* If a missing ":endtry", ":endwhile", ":endfor", or ":endif" or a memory
+  // If a missing ":endtry", ":endwhile", ":endfor", or ":endif" or a memory
-   * lack was reported above and the error message is to be converted to an
+  // lack was reported above and the error message is to be converted to an
-   * exception, do this now after rewinding the cstack. */
+  // exception, do this now after rewinding the cstack.
   do_errthrow(&cstack, getline_equal(fgetline, cookie, get_func_line)
       ? (char_u *)"endfunction" : (char_u *)NULL);
 
@@ -1014,9 +1014,9 @@ int getline_equal(LineGetter fgetline, void *cookie, LineGetter func)
   LineGetter gp;
   struct loop_cookie *cp;
 
-  /* When "fgetline" is "get_loop_line()" use the "cookie" to find the
+  // When "fgetline" is "get_loop_line()" use the "cookie" to find the
-   * function that's originally used to obtain the lines.  This may be
+  // function that's originally used to obtain the lines.  This may be
-   * nested several levels. */
+  // nested several levels.
   gp = fgetline;
   cp = (struct loop_cookie *)cookie;
   while (gp == get_loop_line) {
@@ -1035,9 +1035,9 @@ void *getline_cookie(LineGetter fgetline, void *cookie)
   LineGetter gp;
   struct loop_cookie *cp;
 
-  /* When "fgetline" is "get_loop_line()" use the "cookie" to find the
+  // When "fgetline" is "get_loop_line()" use the "cookie" to find the
-   * cookie that's originally used to obtain the lines.  This may be nested
+  // cookie that's originally used to obtain the lines.  This may be nested
-   * several levels. */
+  // several levels.
   gp = fgetline;
   cp = (struct loop_cookie *)cookie;
   while (gp == get_loop_line) {
@@ -2625,9 +2625,9 @@ static char_u *find_command(exarg_T *eap, int *full)
     }
     len = (int)(p - eap->cmd);
     if (*eap->cmd == 'd' && (p[-1] == 'l' || p[-1] == 'p')) {
-      /* Check for ":dl", ":dell", etc. to ":deletel": that's
+      // Check for ":dl", ":dell", etc. to ":deletel": that's
-       * :delete with the 'l' flag.  Same for 'p'. */
+      // :delete with the 'l' flag.  Same for 'p'.
-      for (i = 0; i < len; ++i) {
+      for (i = 0; i < len; i++) {
         if (eap->cmd[i] != ((char_u *)"delete")[i]) {
           break;
         }
@@ -4435,8 +4435,8 @@ int expand_filename(exarg_T *eap, char_u **cmdlinep, char_u **errormsgp)
       continue;
     }
 
-    /* Wildcards won't be expanded below, the replacement is taken
+    // Wildcards won't be expanded below, the replacement is taken
-     * literally.  But do expand "~/file", "~user/file" and "$HOME/file". */
+    // literally.  But do expand "~/file", "~user/file" and "$HOME/file".
     if (vim_strchr(repl, '$') != NULL || vim_strchr(repl, '~') != NULL) {
       char_u *l = repl;
 
@@ -4463,8 +4463,8 @@ int expand_filename(exarg_T *eap, char_u **cmdlinep, char_u **errormsgp)
         && !(eap->argt & EX_NOSPC)) {
       char_u *l;
 #ifdef BACKSLASH_IN_FILENAME
-      /* Don't escape a backslash here, because rem_backslash() doesn't
+      // Don't escape a backslash here, because rem_backslash() doesn't
-       * remove it later. */
+      // remove it later.
       static char_u *nobslash = (char_u *)" \t\"|";
 # define ESCAPE_CHARS nobslash
 #else
@@ -7205,8 +7205,8 @@ void ex_splitview(exarg_T *eap)
     }
   } else if (win_split(eap->addr_count > 0 ? (int)eap->line2 : 0,
                        *eap->cmd == 'v' ? WSP_VERT : 0) != FAIL) {
-    /* Reset 'scrollbind' when editing another file, but keep it when
+    // Reset 'scrollbind' when editing another file, but keep it when
-     * doing ":split" without arguments. */
+    // doing ":split" without arguments.
     if (*eap->arg != NUL
         ) {
       RESET_BINDING(curwin);
@@ -7402,8 +7402,8 @@ static void ex_find(exarg_T *eap)
   fname = find_file_in_path(eap->arg, STRLEN(eap->arg),
                             FNAME_MESS, TRUE, curbuf->b_ffname);
   if (eap->addr_count > 0) {
-    /* Repeat finding the file "count" times.  This matters when it
+    // Repeat finding the file "count" times.  This matters when it
-     * appears several times in the path. */
+    // appears several times in the path.
     count = eap->line2;
     while (fname != NULL && --count > 0) {
       xfree(fname);
@@ -7509,8 +7509,8 @@ void do_exedit(exarg_T *eap, win_T *old_curwin)
         if (!need_hide || buf_hide(curbuf)) {
           cleanup_T cs;
 
-          /* Reset the error/interrupt/exception state here so that
+          // Reset the error/interrupt/exception state here so that
-           * aborting() returns FALSE when closing a window. */
+          // aborting() returns FALSE when closing a window.
           enter_cleanup(&cs);
           win_close(curwin, !need_hide && !buf_hide(curbuf));
 
@@ -7675,8 +7675,8 @@ static void ex_read(exarg_T *eap)
       }
     } else {
       if (empty && exmode_active) {
-        /* Delete the empty line that remains.  Historically ex does
+        // Delete the empty line that remains.  Historically ex does
-         * this but vi doesn't. */
+        // this but vi doesn't.
         if (eap->line2 == 0) {
           lnum = curbuf->b_ml.ml_line_count;
         } else {
@@ -8298,8 +8298,8 @@ static void ex_redir(exarg_T *eap)
     }
   }
 
-  /* Make sure redirection is not off.  Can happen for cmdline completion
+  // Make sure redirection is not off.  Can happen for cmdline completion
-   * that indirectly invokes a command to catch its output. */
+  // that indirectly invokes a command to catch its output.
   if (redir_fd != NULL
       || redir_reg || redir_vname) {
     redir_off = false;

src/nvim/ex_eval.c

@@ -135,8 +135,8 @@ int should_abort(int retcode)
  */
 int aborted_in_try(void)
 {
-  /* This function is only called after an error.  In this case, "force_abort"
+  // This function is only called after an error.  In this case, "force_abort"
-   * determines whether searching for finally clauses is necessary. */
+  // determines whether searching for finally clauses is necessary.
   return force_abort;
 }
 
@@ -321,8 +321,8 @@ void do_errthrow(cstack_T *cstack, char_u *cmdname)
     force_abort = TRUE;
   }
 
-  /* If no exception is to be thrown or the conversion should be done after
+  // If no exception is to be thrown or the conversion should be done after
-   * returning to a previous invocation of do_one_cmd(), do nothing. */
+  // returning to a previous invocation of do_one_cmd(), do nothing.
   if (msg_list == NULL || *msg_list == NULL) {
     return;
   }
@@ -471,8 +471,8 @@ static int throw_exception(void *value, except_type_T type, char_u *cmdname)
   excp = xmalloc(sizeof(except_T));
 
   if (type == ET_ERROR) {
-    /* Store the original message and prefix the exception value with
+    // Store the original message and prefix the exception value with
-     * "Vim:" or, if a command name is given, "Vim(cmdname):". */
+    // "Vim:" or, if a command name is given, "Vim(cmdname):".
     excp->messages = (struct msglist *)value;
   }
 
@@ -940,11 +940,11 @@ void ex_else(exarg_T *eap)
   if (eap->cmdidx == CMD_elseif) {
     bool error;
     result = eval_to_bool(eap->arg, &error, &eap->nextcmd, skip);
-    /* When throwing error exceptions, we want to throw always the first
+    // When throwing error exceptions, we want to throw always the first
-     * of several errors in a row.  This is what actually happens when
+    // of several errors in a row.  This is what actually happens when
-     * a conditional error was detected above and there is another failure
+    // a conditional error was detected above and there is another failure
-     * when parsing the expression.  Since the skip flag is set in this
+    // when parsing the expression.  Since the skip flag is set in this
-     * case, the parsing error will be ignored by emsg(). */
+    // case, the parsing error will be ignored by emsg().
 
     if (!skip && !error) {
       if (result) {
@@ -1000,8 +1000,8 @@ void ex_while(exarg_T *eap)
        * ":for var in list-expr"
        */
       if ((cstack->cs_lflags & CSL_HAD_LOOP) != 0) {
-        /* Jumping here from a ":continue" or ":endfor": use the
+        // Jumping here from a ":continue" or ":endfor": use the
-         * previously evaluated list. */
+        // previously evaluated list.
         fi = cstack->cs_forinfo[cstack->cs_idx];
         error = FALSE;
       } else {
@@ -1033,10 +1033,10 @@ void ex_while(exarg_T *eap)
       cstack->cs_lflags ^= CSL_HAD_LOOP;
     } else {
       cstack->cs_lflags &= ~CSL_HAD_LOOP;
-      /* If the ":while" evaluates to FALSE or ":for" is past the end of
+      // If the ":while" evaluates to FALSE or ":for" is past the end of
-       * the list, show the debug prompt at the ":endwhile"/":endfor" as
+      // the list, show the debug prompt at the ":endwhile"/":endfor" as
-       * if there was a ":break" in a ":while"/":for" evaluating to
+      // if there was a ":break" in a ":while"/":for" evaluating to
-       * TRUE. */
+      // TRUE.
       if (!skip && !error) {
         cstack->cs_flags[cstack->cs_idx] |= CSF_TRUE;
       }
@@ -1125,8 +1125,8 @@ void ex_endwhile(exarg_T *eap)
   } else {
     fl =  cstack->cs_flags[cstack->cs_idx];
     if (!(fl & csf)) {
-      /* If we are in a ":while" or ":for" but used the wrong endloop
+      // If we are in a ":while" or ":for" but used the wrong endloop
-       * command, do not rewind to the next enclosing ":for"/":while". */
+      // command, do not rewind to the next enclosing ":for"/":while".
       if (fl & CSF_WHILE) {
         eap->errmsg = (char_u *)_("E732: Using :endfor with :while");
       } else if (fl & CSF_FOR) {
@@ -1143,8 +1143,8 @@ void ex_endwhile(exarg_T *eap)
       for (idx = cstack->cs_idx; idx > 0; --idx) {
         fl =  cstack->cs_flags[idx];
         if ((fl & CSF_TRY) && !(fl & CSF_FINALLY)) {
-          /* Give up at a try conditional not in its finally clause.
+          // Give up at a try conditional not in its finally clause.
-           * Ignore the ":endwhile"/":endfor". */
+          // Ignore the ":endwhile"/":endfor".
           eap->errmsg = err;
           return;
         }
@@ -1258,9 +1258,9 @@ void do_throw(cstack_T *cstack)
       if (cstack->cs_flags[idx] & CSF_ACTIVE) {
         cstack->cs_flags[idx] |= CSF_THROWN;
       } else {
-        /* THROWN may have already been set for a catchable exception
+        // THROWN may have already been set for a catchable exception
-         * that has been discarded.  Ensure it is reset for the new
+        // that has been discarded.  Ensure it is reset for the new
-         * exception. */
+        // exception.
         cstack->cs_flags[idx] &= ~CSF_THROWN;
       }
     }
@@ -1288,9 +1288,9 @@ void ex_try(exarg_T *eap)
     skip = CHECK_SKIP;
 
     if (!skip) {
-      /* Set ACTIVE and TRUE.  TRUE means that the corresponding ":catch"
+      // Set ACTIVE and TRUE.  TRUE means that the corresponding ":catch"
-       * commands should check for a match if an exception is thrown and
+      // commands should check for a match if an exception is thrown and
-       * that the finally clause needs to be executed. */
+      // that the finally clause needs to be executed.
       cstack->cs_flags[cstack->cs_idx] |= CSF_ACTIVE | CSF_TRUE;
 
       /*
@@ -1343,8 +1343,8 @@ void ex_catch(exarg_T *eap)
     give_up = TRUE;
   } else {
     if (!(cstack->cs_flags[cstack->cs_idx] & CSF_TRY)) {
-      /* Report what's missing if the matching ":try" is not in its
+      // Report what's missing if the matching ":try" is not in its
-       * finally clause. */
+      // finally clause.
       eap->errmsg = get_end_emsg(cstack);
       skip = TRUE;
     }
@@ -1497,9 +1497,9 @@ void ex_finally(exarg_T *eap)
           break;
         }
       }
-      /* Make this error pending, so that the commands in the following
+      // Make this error pending, so that the commands in the following
-       * finally clause can be executed.  This overrules also a pending
+      // finally clause can be executed.  This overrules also a pending
-       * ":continue", ":break", ":return", or ":finish". */
+      // ":continue", ":break", ":return", or ":finish".
       pending = CSTP_ERROR;
     } else {
       idx = cstack->cs_idx;
@@ -1524,14 +1524,14 @@ void ex_finally(exarg_T *eap)
     skip = !(cstack->cs_flags[cstack->cs_idx] & CSF_TRUE);
 
     if (!skip) {
-      /* When debugging or a breakpoint was encountered, display the
+      // When debugging or a breakpoint was encountered, display the
-       * debug prompt (if not already done).  The user then knows that the
+      // debug prompt (if not already done).  The user then knows that the
-       * finally clause is executed. */
+      // finally clause is executed.
       if (dbg_check_skipped(eap)) {
-        /* Handle a ">quit" debug command as if an interrupt had
+        // Handle a ">quit" debug command as if an interrupt had
-         * occurred before the ":finally".  That is, discard the
+        // occurred before the ":finally".  That is, discard the
-         * original exception and replace it by an interrupt
+        // original exception and replace it by an interrupt
-         * exception. */
+        // exception.
         (void)do_intthrow(cstack);
       }
 
@@ -1732,13 +1732,13 @@ void ex_endtry(exarg_T *eap)
       case CSTP_NONE:
         break;
 
-      /* Reactivate a pending ":continue", ":break", ":return",
+      // Reactivate a pending ":continue", ":break", ":return",
-       * ":finish" from the try block or a catch clause of this try
+      // ":finish" from the try block or a catch clause of this try
-       * conditional.  This is skipped, if there was an error in an
+      // conditional.  This is skipped, if there was an error in an
-       * (unskipped) conditional command or an interrupt afterwards
+      // (unskipped) conditional command or an interrupt afterwards
-       * or if the finally clause is present and executed a new error,
+      // or if the finally clause is present and executed a new error,
-       * interrupt, throw, ":continue", ":break", ":return", or
+      // interrupt, throw, ":continue", ":break", ":return", or
-       * ":finish". */
+      // ":finish".
       case CSTP_CONTINUE:
         ex_continue(eap);
         break;
@@ -1866,10 +1866,10 @@ void leave_cleanup(cleanup_T *csp)
     return;
   }
 
-  /* If there was an aborting error, an interrupt, or an uncaught exception
+  // If there was an aborting error, an interrupt, or an uncaught exception
-   * after the corresponding call to enter_cleanup(), discard what has been
+  // after the corresponding call to enter_cleanup(), discard what has been
-   * made pending by it.  Report this to the user if required by the
+  // made pending by it.  Report this to the user if required by the
-   * 'verbose' option or when debugging. */
+  // 'verbose' option or when debugging.
   if (aborting() || need_rethrow) {
     if (pending & CSTP_THROW) {
       // Cancel the pending exception (includes report).
@@ -1878,8 +1878,8 @@ void leave_cleanup(cleanup_T *csp)
       report_discard_pending(pending, NULL);
     }
 
-    /* If an error was about to be converted to an exception when
+    // If an error was about to be converted to an exception when
-     * enter_cleanup() was called, free the message list. */
+    // enter_cleanup() was called, free the message list.
     if (msg_list != NULL) {
       free_global_msglist();
     }
@@ -1999,10 +1999,10 @@ int cleanup_conditionals(cstack_T *cstack, int searched_cond, int inclusive)
             && (cstack->cs_flags[idx] & CSF_CAUGHT)) {
           finish_exception((except_T *)cstack->cs_exception[idx]);
         }
-        /* Stop at this try conditional - except the try block never
+        // Stop at this try conditional - except the try block never
-         * got active (because of an inactive surrounding conditional
+        // got active (because of an inactive surrounding conditional
-         * or when the ":try" appeared after an error or interrupt or
+        // or when the ":try" appeared after an error or interrupt or
-         * throw). */
+        // throw).
         if (cstack->cs_flags[idx] & CSF_TRUE) {
           if (searched_cond == 0 && !inclusive) {
             break;
@@ -2012,10 +2012,10 @@ int cleanup_conditionals(cstack_T *cstack, int searched_cond, int inclusive)
       }
     }
 
-    /* Stop on the searched conditional type (even when the surrounding
+    // Stop on the searched conditional type (even when the surrounding
-     * conditional is not active or something has been made pending).
+    // conditional is not active or something has been made pending).
-     * If "inclusive" is TRUE and "searched_cond" is CSF_TRY|CSF_SILENT,
+    // If "inclusive" is TRUE and "searched_cond" is CSF_TRY|CSF_SILENT,
-     * check first whether "emsg_silent" needs to be restored. */
+    // check first whether "emsg_silent" needs to be restored.
     if (cstack->cs_flags[idx] & searched_cond) {
       if (!inclusive) {
         break;

src/nvim/ex_getln.c

@@ -2637,8 +2637,8 @@ static void realloc_cmdbuff(int len)
       && ccline.xpc->xp_context != EXPAND_UNSUCCESSFUL) {
     int i = (int)(ccline.xpc->xp_pattern - p);
 
-    /* If xp_pattern points inside the old cmdbuff it needs to be adjusted
+    // If xp_pattern points inside the old cmdbuff it needs to be adjusted
-     * to point into the newly allocated memory. */
+    // to point into the newly allocated memory.
     if (i >= 0 && i <= ccline.cmdlen) {
       ccline.xpc->xp_pattern = ccline.cmdbuff + i;
     }
@@ -3457,8 +3457,8 @@ static bool cmdline_paste(int regname, bool literally, bool remcr)
       return FAIL;
     }
 
-    /* When 'incsearch' is set and CTRL-R CTRL-W used: skip the duplicate
+    // When 'incsearch' is set and CTRL-R CTRL-W used: skip the duplicate
-     * part of the word. */
+    // part of the word.
     p = arg;
     if (p_is && regname == Ctrl_W) {
       char_u *w;
@@ -5976,8 +5976,8 @@ int set_cmdline_pos(int pos)
     return 1;
   }
 
-  /* The position is not set directly but after CTRL-\ e or CTRL-R = has
+  // The position is not set directly but after CTRL-\ e or CTRL-R = has
-   * changed the command line. */
+  // changed the command line.
   if (pos < 0) {
     new_cmdpos = 0;
   } else {
@@ -6471,8 +6471,8 @@ static int open_cmdwin(void)
 
   exmode_active = save_exmode;
 
-  /* Safety check: The old window or buffer was deleted: It's a bug when
+  // Safety check: The old window or buffer was deleted: It's a bug when
-   * this happens! */
+  // this happens!
   if (!win_valid(old_curwin) || !bufref_valid(&old_curbuf)) {
     cmdwin_result = Ctrl_C;
     EMSG(_("E199: Active window or buffer deleted"));
@@ -6498,8 +6498,8 @@ static int open_cmdwin(void)
         stuffcharReadbuff(CAR);
       }
     } else if (cmdwin_result == Ctrl_C) {
-      /* :q or :close, don't execute any command
+      // :q or :close, don't execute any command
-       * and don't modify the cmd window. */
+      // and don't modify the cmd window.
       ccline.cmdbuff = NULL;
     } else {
       ccline.cmdbuff = vim_strsave(get_cursor_line_ptr());

src/nvim/fileio.c

@@ -269,10 +269,10 @@ int readfile(char_u *fname, char_u *sfname, linenr_T from, linenr_T lines_to_ski
     }
   }
 
-  /* Remember the initial values of curbuf, curbuf->b_ffname and
+  // Remember the initial values of curbuf, curbuf->b_ffname and
-   * curbuf->b_fname to detect whether they are altered as a result of
+  // curbuf->b_fname to detect whether they are altered as a result of
-   * executing nasty autocommands.  Also check if "fname" and "sfname"
+  // executing nasty autocommands.  Also check if "fname" and "sfname"
-   * point to one of these values. */
+  // point to one of these values.
   old_curbuf = curbuf;
   old_b_ffname = curbuf->b_ffname;
   old_b_fname = curbuf->b_fname;
@@ -429,8 +429,8 @@ int readfile(char_u *fname, char_u *sfname, linenr_T from, linenr_T lines_to_ski
       curbuf->b_orig_mode = 0;
     }
 
-    /* Reset the "new file" flag.  It will be set again below when the
+    // Reset the "new file" flag.  It will be set again below when the
-     * file doesn't exist. */
+    // file doesn't exist.
     curbuf->b_flags &= ~(BF_NEW | BF_NEW_W);
   }
 
@@ -514,8 +514,8 @@ int readfile(char_u *fname, char_u *sfname, linenr_T from, linenr_T lines_to_ski
   }
 
   if (set_options) {
-    /* Don't change 'eol' if reading from buffer as it will already be
+    // Don't change 'eol' if reading from buffer as it will already be
-     * correctly set when reading stdin. */
+    // correctly set when reading stdin.
     if (!read_buffer) {
       curbuf->b_p_eol = TRUE;
       curbuf->b_start_eol = TRUE;
@@ -816,8 +816,8 @@ retry:
   fio_flags = 0;
   converted = need_conversion(fenc);
   if (converted) {
-    /* "ucs-bom" means we need to check the first bytes of the file
+    // "ucs-bom" means we need to check the first bytes of the file
-     * for a BOM. */
+    // for a BOM.
     if (STRCMP(fenc, ENC_UCSBOM) == 0) {
       fio_flags = FIO_UCSBOM;
     } else {
@@ -949,16 +949,16 @@ retry:
         ptr = buffer + linerest;
         line_start = buffer;
 
-        /* May need room to translate into.
+        // May need room to translate into.
-         * For iconv() we don't really know the required space, use a
+        // For iconv() we don't really know the required space, use a
-         * factor ICONV_MULT.
+        // factor ICONV_MULT.
-         * latin1 to utf-8: 1 byte becomes up to 2 bytes
+        // latin1 to utf-8: 1 byte becomes up to 2 bytes
-         * utf-16 to utf-8: 2 bytes become up to 3 bytes, 4 bytes
+        // utf-16 to utf-8: 2 bytes become up to 3 bytes, 4 bytes
-         * become up to 4 bytes, size must be multiple of 2
+        // become up to 4 bytes, size must be multiple of 2
-         * ucs-2 to utf-8: 2 bytes become up to 3 bytes, size must be
+        // ucs-2 to utf-8: 2 bytes become up to 3 bytes, size must be
-         * multiple of 2
+        // multiple of 2
-         * ucs-4 to utf-8: 4 bytes become up to 6 bytes, size must be
+        // ucs-4 to utf-8: 4 bytes become up to 6 bytes, size must be
-         * multiple of 4 */
+        // multiple of 4
         real_size = (int)size;
 #ifdef HAVE_ICONV
         if (iconv_fd != (iconv_t)-1) {
@@ -1000,9 +1000,9 @@ retry:
               p = ml_get(read_buf_lnum) + read_buf_col;
               n = (int)STRLEN(p);
               if ((int)tlen + n + 1 > size) {
-                /* Filled up to "size", append partial line.
+                // Filled up to "size", append partial line.
-                 * Change NL to NUL to reverse the effect done
+                // Change NL to NUL to reverse the effect done
-                 * below. */
+                // below.
                 n = (int)(size - tlen);
                 for (ni = 0; ni < n; ++ni) {
                   if (p[ni] == NL) {
@@ -1026,8 +1026,8 @@ retry:
                 ptr[tlen++] = NL;
                 read_buf_col = 0;
                 if (++read_buf_lnum > from) {
-                  /* When the last line didn't have an
+                  // When the last line didn't have an
-                   * end-of-line don't add it now either. */
+                  // end-of-line don't add it now either.
                   if (!curbuf->b_p_eol) {
                     --tlen;
                   }
@@ -1279,8 +1279,8 @@ retry:
           }
         }
 
-        /* If there is a trailing incomplete sequence move it to
+        // If there is a trailing incomplete sequence move it to
-         * conv_rest[]. */
+        // conv_rest[].
         if (tail != NULL) {
           conv_restlen = (int)((ptr + size) - tail);
           memmove(conv_rest, tail, conv_restlen);
@@ -1320,8 +1320,8 @@ retry:
                 }
               }
 
-              /* found second word of double-word, get the first
+              // found second word of double-word, get the first
-               * word and compute the resulting character */
+              // word and compute the resulting character
               if (fio_flags & FIO_ENDIAN_L) {
                 u16c = (*--p << 8);
                 u16c += *--p;
@@ -1369,9 +1369,9 @@ retry:
               p -= len;
               u8c = utf_ptr2char(p);
               if (len == 0) {
-                /* Not a valid UTF-8 character, retry with
+                // Not a valid UTF-8 character, retry with
-                 * another fenc when possible, otherwise just
+                // another fenc when possible, otherwise just
-                 * report the error. */
+                // report the error.
                 if (can_retry) {
                   goto rewind_retry;
                 }
@@ -1435,9 +1435,9 @@ retry:
               }
             }
             if (l == 1 || l > todo) {
-              /* Illegal byte.  If we can try another encoding
+              // Illegal byte.  If we can try another encoding
-               * do that, unless at EOF where a truncated
+              // do that, unless at EOF where a truncated
-               * file is more likely than a conversion error. */
+              // file is more likely than a conversion error.
               if (can_retry && !incomplete_tail) {
                 break;
               }
@@ -1909,8 +1909,8 @@ failed:
    */
   curbuf->b_no_eol_lnum = read_no_eol_lnum;
 
-  /* When reloading a buffer put the cursor at the first line that is
+  // When reloading a buffer put the cursor at the first line that is
-   * different. */
+  // different.
   if (flags & READ_KEEP_UNDO) {
     u_find_first_changed();
   }
@@ -1929,8 +1929,8 @@ failed:
     int m = msg_scroll;
     int n = msg_scrolled;
 
-    /* Save the fileformat now, otherwise the buffer will be considered
+    // Save the fileformat now, otherwise the buffer will be considered
-     * modified if the format/encoding was automatically detected. */
+    // modified if the format/encoding was automatically detected.
     if (set_options) {
       save_file_ff(curbuf);
     }
@@ -4804,15 +4804,15 @@ int check_timestamps(int focus)
 {
   int didit = 0;
 
-  /* Don't check timestamps while system() or another low-level function may
+  // Don't check timestamps while system() or another low-level function may
-   * cause us to lose and gain focus. */
+  // cause us to lose and gain focus.
   if (no_check_timestamps > 0) {
     return FALSE;
   }
 
-  /* Avoid doing a check twice.  The OK/Reload dialog can cause a focus
+  // Avoid doing a check twice.  The OK/Reload dialog can cause a focus
-   * event and we would keep on checking if the file is steadily growing.
+  // event and we would keep on checking if the file is steadily growing.
-   * Do check again after typing something. */
+  // Do check again after typing something.
   if (focus && did_check_timestamps) {
     need_check_timestamps = TRUE;
     return FALSE;
@@ -5025,8 +5025,8 @@ int buf_check_timestamp(buf_T *buf)
             mesg = _("W16: Warning: Mode of file \"%s\" has changed since editing started");
             mesg2 = _("See \":help W16\" for more info.");
           } else {
-            /* Only timestamp changed, store it to avoid a warning
+            // Only timestamp changed, store it to avoid a warning
-             * in check_mtime() later. */
+            // in check_mtime() later.
             buf->b_mtime_read = buf->b_mtime;
           }
         }
@@ -5623,12 +5623,11 @@ char_u *file_pat_to_reg_pat(const char_u *pat, const char_u *pat_end, char *allo
       }
 #ifdef BACKSLASH_IN_FILENAME
       if (!no_bslash) {
-        /* translate:
+        // translate:
-         * "\x" to "\\x"  e.g., "dir\file"
+        // "\x" to "\\x"  e.g., "dir\file"
-         * "\*" to "\\.*" e.g., "dir\*.c"
+        // "\*" to "\\.*" e.g., "dir\*.c"
-         * "\?" to "\\."  e.g., "dir\??.c"
+        // "\?" to "\\."  e.g., "dir\??.c"
-         * "\+" to "\+"   e.g., "fileX\+.c"
+        // "\+" to "\+"   e.g., "fileX\+.c"
-         */
         if ((vim_isfilec(p[1]) || p[1] == '*' || p[1] == '?')
             && p[1] != '+') {
           reg_pat[i++] = '[';
@@ -5642,16 +5641,15 @@ char_u *file_pat_to_reg_pat(const char_u *pat, const char_u *pat_end, char *allo
         }
       }
 #endif
-      /* Undo escaping from ExpandEscape():
+      // Undo escaping from ExpandEscape():
-       * foo\?bar -> foo?bar
+      // foo\?bar -> foo?bar
-       * foo\%bar -> foo%bar
+      // foo\%bar -> foo%bar
-       * foo\,bar -> foo,bar
+      // foo\,bar -> foo,bar
-       * foo\ bar -> foo bar
+      // foo\ bar -> foo bar
-       * Don't unescape \, * and others that are also special in a
+      // Don't unescape \, * and others that are also special in a
-       * regexp.
+      // regexp.
-       * An escaped { must be unescaped since we use magic not
+      // An escaped { must be unescaped since we use magic not
-       * verymagic.  Use "\\\{n,m\}"" to get "\{n,m}".
+      // verymagic.  Use "\\\{n,m\}"" to get "\{n,m}".
-       */
       if (*++p == '?'
 #ifdef BACKSLASH_IN_FILENAME
           && no_bslash

src/nvim/fold.c

@@ -224,8 +224,8 @@ bool hasFoldingWin(win_T *const win, const linenr_T lnum, linenr_T *const firstp
         break;
       }
 
-      /* Fold found, but it's open: Check nested folds.  Line number is
+      // Fold found, but it's open: Check nested folds.  Line number is
-       * relative to containing fold. */
+      // relative to containing fold.
       gap = &fp->fd_nested;
       lnum_rel -= fp->fd_top;
       ++level;
@@ -264,8 +264,8 @@ bool hasFoldingWin(win_T *const win, const linenr_T lnum, linenr_T *const firstp
  */
 int foldLevel(linenr_T lnum)
 {
-  /* While updating the folds lines between invalid_top and invalid_bot have
+  // While updating the folds lines between invalid_top and invalid_bot have
-   * an undefined fold level.  Otherwise update the folds first. */
+  // an undefined fold level.  Otherwise update the folds first.
   if (invalid_top == (linenr_T)0) {
     checkupdate(curwin);
   } else if (lnum == prev_lnum && prev_lnum_lvl >= 0) {
@@ -492,9 +492,9 @@ static void newFoldLevelWin(win_T *wp)
 
   checkupdate(wp);
   if (wp->w_fold_manual) {
-    /* Set all flags for the first level of folds to FD_LEVEL.  Following
+    // Set all flags for the first level of folds to FD_LEVEL.  Following
-     * manual open/close will then change the flags to FD_OPEN or
+    // manual open/close will then change the flags to FD_OPEN or
-     * FD_CLOSED for those folds that don't use 'foldlevel'. */
+    // FD_CLOSED for those folds that don't use 'foldlevel'.
     fp = (fold_T *)wp->w_folds.ga_data;
     for (int i = 0; i < wp->w_folds.ga_len; ++i) {
       fp[i].fd_flags = FD_LEVEL;
@@ -904,8 +904,8 @@ int foldMoveTo(const bool updown, const int dir, const long count)
           break;
         }
 
-        /* When moving up, consider a fold above the cursor; when
+        // When moving up, consider a fold above the cursor; when
-         * moving down consider a fold below the cursor. */
+        // moving down consider a fold below the cursor.
         if (dir == FORWARD) {
           if (fp - (fold_T *)gap->ga_data >= gap->ga_len) {
             break;
@@ -1424,13 +1424,13 @@ void deleteFoldRecurse(buf_T *bp, garray_T *gap)
  */
 void foldMarkAdjust(win_T *wp, linenr_T line1, linenr_T line2, long amount, long amount_after)
 {
-  /* If deleting marks from line1 to line2, but not deleting all those
+  // If deleting marks from line1 to line2, but not deleting all those
-   * lines, set line2 so that only deleted lines have their folds removed. */
+  // lines, set line2 so that only deleted lines have their folds removed.
   if (amount == MAXLNUM && line2 >= line1 && line2 - line1 >= -amount_after) {
     line2 = line1 - amount_after - 1;
   }
-  /* If appending a line in Insert mode, it should be included in the fold
+  // If appending a line in Insert mode, it should be included in the fold
-   * just above the line. */
+  // just above the line.
   if ((State & INSERT) && amount == (linenr_T)1 && line2 == MAXLNUM) {
     line1--;
   }
@@ -1449,8 +1449,8 @@ static void foldMarkAdjustRecurse(win_T *wp, garray_T *gap, linenr_T line1, line
     return;
   }
 
-  /* In Insert mode an inserted line at the top of a fold is considered part
+  // In Insert mode an inserted line at the top of a fold is considered part
-   * of the fold, otherwise it isn't. */
+  // of the fold, otherwise it isn't.
   if ((State & INSERT) && amount == (linenr_T)1 && line2 == MAXLNUM) {
     top = line1 + 1;
   } else {
@@ -1580,8 +1580,8 @@ static bool check_closed(win_T *const wp, fold_T *const fp, bool *const use_leve
 {
   bool closed = false;
 
-  /* Check if this fold is closed.  If the flag is FD_LEVEL this
+  // Check if this fold is closed.  If the flag is FD_LEVEL this
-   * fold and all folds it contains depend on 'foldlevel'. */
+  // fold and all folds it contains depend on 'foldlevel'.
   if (*use_levelp || fp->fd_flags == FD_LEVEL) {
     *use_levelp = true;
     if (level >= wp->w_p_fdl) {
@@ -2035,8 +2035,8 @@ static void foldUpdateIEMS(win_T *const wp, linenr_T top, linenr_T bot)
     // Init marker variables to speed up foldlevelMarker().
     parseMarker(wp);
 
-    /* Need to get the level of the line above top, it is used if there is
+    // Need to get the level of the line above top, it is used if there is
-     * no marker at the top. */
+    // no marker at the top.
     if (top > 1) {
       // Get the fold level at top - 1.
       const int level = foldLevelWin(wp, top - 1);
@@ -2046,9 +2046,9 @@ static void foldUpdateIEMS(win_T *const wp, linenr_T top, linenr_T bot)
       fline.lvl = level;
       getlevel(&fline);
 
-      /* If a fold started here, we already had the level, if it stops
+      // If a fold started here, we already had the level, if it stops
-       * here, we need to use lvl_next.  Could also start and end a fold
+      // here, we need to use lvl_next.  Could also start and end a fold
-       * in the same line. */
+      // in the same line.
       if (fline.lvl > level) {
         fline.lvl = level - (fline.lvl - fline.lvl_next);
       } else {
@@ -2061,8 +2061,8 @@ static void foldUpdateIEMS(win_T *const wp, linenr_T top, linenr_T bot)
     fline.lnum = top;
     if (foldmethodIsExpr(wp)) {
       getlevel = foldlevelExpr;
-      /* start one line back, because a "<1" may indicate the end of a
+      // start one line back, because a "<1" may indicate the end of a
-       * fold in the topline */
+      // fold in the topline
       if (top > 1) {
         --fline.lnum;
       }
@@ -2151,9 +2151,9 @@ static void foldUpdateIEMS(win_T *const wp, linenr_T top, linenr_T bot)
         end = fp->fd_top + fp->fd_len - 1;
       } else if (getlevel == foldlevelSyntax
                  && foldLevelWin(wp, fline.lnum) != fline.lvl) {
-        /* For "syntax" method: Compare the foldlevel that the syntax
+        // For "syntax" method: Compare the foldlevel that the syntax
-         * tells us to the foldlevel from the existing folds.  If they
+        // tells us to the foldlevel from the existing folds.  If they
-         * don't match continue updating folds. */
+        // don't match continue updating folds.
         end = fline.lnum;
       } else {
         break;
@@ -2185,9 +2185,9 @@ static void foldUpdateIEMS(win_T *const wp, linenr_T top, linenr_T bot)
     changed_window_setting_win(wp);
   }
 
-  /* If we updated folds past "bot", need to redraw more lines.  Don't do
+  // If we updated folds past "bot", need to redraw more lines.  Don't do
-   * this in other situations, the changed lines will be redrawn anyway and
+  // this in other situations, the changed lines will be redrawn anyway and
-   * this method can cause the whole window to be updated. */
+  // this method can cause the whole window to be updated.
   if (end != bot) {
     if (wp->w_redraw_top == 0 || wp->w_redraw_top > top) {
       wp->w_redraw_top = top;
@@ -2272,10 +2272,10 @@ static linenr_T foldUpdateIEMSRecurse(garray_T *const gap, const int level,
     // Updating folds can be slow, check for CTRL-C.
     line_breakcheck();
 
-    /* Set "lvl" to the level of line "flp->lnum".  When flp->start is set
+    // Set "lvl" to the level of line "flp->lnum".  When flp->start is set
-     * and after the first line of the fold, set the level to zero to
+    // and after the first line of the fold, set the level to zero to
-     * force the fold to end.  Do the same when had_end is set: Previous
+    // force the fold to end.  Do the same when had_end is set: Previous
-     * line was marked as end of a fold. */
+    // line was marked as end of a fold.
     lvl = flp->lvl;
     if (lvl > MAX_LEVEL) {
       lvl = MAX_LEVEL;
@@ -2286,12 +2286,11 @@ static linenr_T foldUpdateIEMSRecurse(garray_T *const gap, const int level,
     }
 
     if (flp->lnum > bot && !finish && fp != NULL) {
-      /* For "marker" and "syntax" methods:
+      // For "marker" and "syntax" methods:
-       * - If a change caused a nested fold to be removed, we need to
+      // - If a change caused a nested fold to be removed, we need to
-       *   delete it and continue at least until where it ended.
+      //   delete it and continue at least until where it ended.
-       * - If a change caused a nested fold to be created, or this fold
+      // - If a change caused a nested fold to be created, or this fold
-       *   to continue below its original end, need to finish this fold.
+      //   to continue below its original end, need to finish this fold.
-       */
       if (getlevel != foldlevelMarker
           && getlevel != foldlevelExpr
           && getlevel != foldlevelSyntax) {
@@ -2300,9 +2299,9 @@ static linenr_T foldUpdateIEMSRecurse(garray_T *const gap, const int level,
       i = 0;
       fp2 = fp;
       if (lvl >= level) {
-        /* Compute how deep the folds currently are, if it's deeper
+        // Compute how deep the folds currently are, if it's deeper
-         * than "lvl" then some must be deleted, need to update
+        // than "lvl" then some must be deleted, need to update
-         * at least one nested fold. */
+        // at least one nested fold.
         ll = flp->lnum - fp->fd_top;
         while (foldFind(&fp2->fd_nested, ll, &fp2)) {
           ++i;
@@ -2321,9 +2320,9 @@ static linenr_T foldUpdateIEMSRecurse(garray_T *const gap, const int level,
       }
     }
 
-    /* At the start of the first nested fold and at the end of the current
+    // At the start of the first nested fold and at the end of the current
-     * fold: check if existing folds at this level, before the current
+    // fold: check if existing folds at this level, before the current
-     * one, need to be deleted or truncated. */
+    // one, need to be deleted or truncated.
     if (fp == NULL
         && (lvl != level
             || flp->lnum_save >= bot
@@ -2356,10 +2355,10 @@ static linenr_T foldUpdateIEMSRecurse(garray_T *const gap, const int level,
                         || (lvl >= level
                             && fp->fd_top <= flp->lnum_save))))) {
           if (fp->fd_top + fp->fd_len + concat > firstlnum) {
-            /* Use existing fold for the new fold.  If it starts
+            // Use existing fold for the new fold.  If it starts
-             * before where we started looking, extend it.  If it
+            // before where we started looking, extend it.  If it
-             * starts at another line, update nested folds to keep
+            // starts at another line, update nested folds to keep
-             * their position, compensating for the new fd_top. */
+            // their position, compensating for the new fd_top.
             if (fp->fd_top == firstlnum) {
               // We have found a fold beginning exactly where we want one.
             } else if (fp->fd_top >= startlnum) {
@@ -2503,8 +2502,8 @@ static linenr_T foldUpdateIEMSRecurse(garray_T *const gap, const int level,
         bot = flp->lnum;
       }
 
-      /* Line numbers in the nested fold are relative to the start of
+      // Line numbers in the nested fold are relative to the start of
-       * this fold. */
+      // this fold.
       flp->lnum = flp->lnum_save - fp->fd_top;
       flp->off += fp->fd_top;
       i = (int)(fp - (fold_T *)gap->ga_data);
@@ -2547,8 +2546,8 @@ static linenr_T foldUpdateIEMSRecurse(garray_T *const gap, const int level,
         break;
       }
 
-      /* leave flp->lnum_save to lnum of the line that was used to get
+      // leave flp->lnum_save to lnum of the line that was used to get
-       * the level, flp->lnum to the lnum of the next line. */
+      // the level, flp->lnum to the lnum of the next line.
       flp->lnum_save = flp->lnum;
       flp->lnum = ll;
     }
@@ -2633,8 +2632,8 @@ static linenr_T foldUpdateIEMSRecurse(garray_T *const gap, const int level,
     deleteFoldEntry(flp->wp, gap, (int)(fp2 - (fold_T *)gap->ga_data), true);
   }
 
-  /* Need to redraw the lines we inspected, which might be further down than
+  // Need to redraw the lines we inspected, which might be further down than
-   * was asked for. */
+  // was asked for.
   if (bot < flp->lnum - 1) {
     bot = flp->lnum - 1;
   }
@@ -2947,8 +2946,8 @@ static void foldMerge(win_T *const wp, fold_T *fp1, garray_T *gap, fold_T *fp2)
   garray_T *gap1 = &fp1->fd_nested;
   garray_T *gap2 = &fp2->fd_nested;
 
-  /* If the last nested fold in fp1 touches the first nested fold in fp2,
+  // If the last nested fold in fp1 touches the first nested fold in fp2,
-   * merge them recursively. */
+  // merge them recursively.
   if (foldFind(gap1, fp1->fd_len - 1L, &fp3) && foldFind(gap2, 0L, &fp4)) {
     foldMerge(wp, fp3, gap2, fp4);
   }
@@ -2985,8 +2984,8 @@ static void foldlevelIndent(fline_T *flp)
   buf = flp->wp->w_buffer;
   s = skipwhite(ml_get_buf(buf, lnum, false));
 
-  /* empty line or lines starting with a character in 'foldignore': level
+  // empty line or lines starting with a character in 'foldignore': level
-   * depends on surrounding lines */
+  // depends on surrounding lines
   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) {
@@ -3089,8 +3088,8 @@ static void foldlevelExpr(fline_T *flp)
   // "-1", "0", "1", ..: set fold level
   default:
     if (n < 0) {
-      /* Use the current level for the next line, so that "a1"
+      // Use the current level for the next line, so that "a1"
-       * will work there. */
+      // will work there.
       flp->lvl_next = flp->lvl;
     } else {
       flp->lvl_next = n;
@@ -3099,8 +3098,8 @@ static void foldlevelExpr(fline_T *flp)
     break;
   }
 
-  /* If the level is unknown for the first or the last line in the file, use
+  // If the level is unknown for the first or the last line in the file, use
-   * level 0. */
+  // level 0.
   if (flp->lvl < 0) {
     if (lnum <= 1) {
       flp->lvl = 0;

src/nvim/main.c

@@ -583,9 +583,9 @@ void getout(int exitval)
 {
   exiting = true;
 
-  /* When running in Ex mode an error causes us to exit with a non-zero exit
+  // When running in Ex mode an error causes us to exit with a non-zero exit
-   * code.  POSIX requires this, although it's not 100% clear from the
+  // code.  POSIX requires this, although it's not 100% clear from the
-   * standard. */
+  // standard.
   if (exmode_active) {
     exitval += ex_exitval;
   }

src/nvim/mark.c

@@ -121,8 +121,8 @@ int setmark_pos(int c, pos_T *pos, int fnum)
     return OK;
   }
 
-  /* Allow setting '[ and '] for an autocommand that simulates reading a
+  // Allow setting '[ and '] for an autocommand that simulates reading a
-   * file. */
+  // file.
   if (c == '[') {
     buf->b_op_start = *pos;
     return OK;
@@ -338,8 +338,8 @@ pos_T *getmark_buf_fnum(buf_T *buf, int c, bool changefile, int *fnum)
 
   posp = NULL;
 
-  /* Check for special key, can't be a mark name and might cause islower()
+  // Check for special key, can't be a mark name and might cause islower()
-   * to crash. */
+  // to crash.
   if (c < 0) {
     return posp;
   }
@@ -434,8 +434,7 @@ pos_T *getmark_buf_fnum(buf_T *buf, int c, bool changefile, int *fnum)
         }
         pos_copy.lnum = -1;             // can't get file
       } else {
-        pos_copy.lnum = 0;              /* mark exists, but is not valid in
+        pos_copy.lnum = 0;      // mark exists, but is not valid in current buffer
-                                           current buffer */
       }
     }
   }
@@ -457,10 +456,10 @@ pos_T *getnextmark(pos_T *startpos, int dir, int begin_line)
 
   pos = *startpos;
 
-  /* When searching backward and leaving the cursor on the first non-blank,
+  // When searching backward and leaving the cursor on the first non-blank,
-   * position must be in a previous line.
+  // position must be in a previous line.
-   * When searching forward and leaving the cursor on the first non-blank,
+  // When searching forward and leaving the cursor on the first non-blank,
-   * position must be in a next line. */
+  // position must be in a next line.
   if (dir == BACKWARD && begin_line) {
     pos.col = 0;
   } else if (dir == FORWARD && begin_line) {
@@ -569,8 +568,8 @@ int check_mark(pos_T *pos)
     return FAIL;
   }
   if (pos->lnum <= 0) {
-    /* lnum is negative if mark is in another file can can't get that
+    // lnum is negative if mark is in another file can can't get that
-     * file, error message already give then. */
+    // file, error message already give then.
     if (pos->lnum == 0) {
       EMSG(_(e_marknotset));
     }
@@ -1058,9 +1057,9 @@ static void mark_adjust_internal(linenr_T line1, linenr_T line2, long amount, lo
    */
   FOR_ALL_TAB_WINDOWS(tab, win) {
     if (!cmdmod.lockmarks) {
-      /* Marks in the jumplist.  When deleting lines, this may create
+      // Marks in the jumplist.  When deleting lines, this may create
-       * duplicate marks in the jumplist, they will be removed later. */
+      // duplicate marks in the jumplist, they will be removed later.
-      for (i = 0; i < win->w_jumplistlen; ++i) {
+      for (i = 0; i < win->w_jumplistlen; i++) {
         if (win->w_jumplist[i].fmark.fnum == fnum) {
           one_adjust_nodel(&(win->w_jumplist[i].fmark.mark.lnum));
         }
@@ -1083,8 +1082,8 @@ static void mark_adjust_internal(linenr_T line1, linenr_T line2, long amount, lo
         one_adjust_nodel(&(win->w_old_visual_lnum));
       }
 
-      /* topline and cursor position for windows with the same buffer
+      // topline and cursor position for windows with the same buffer
-       * other than the current window */
+      // other than the current window
       if (win != curwin) {
         if (win->w_topline >= line1 && win->w_topline <= line2) {
           if (amount == MAXLNUM) {                  // topline is deleted

src/nvim/mbyte.c

@@ -190,9 +190,9 @@ enc_canon_table[] =
 #define IDX_BIG5        29
   { "big5",            ENC_DBCS,               DBCS_CHT },
 
-  /* MS-DOS and MS-Windows codepages are included here, so that they can be
+  // MS-DOS and MS-Windows codepages are included here, so that they can be
-   * used on Unix too.  Most of them are similar to ISO-8859 encodings, but
+  // used on Unix too.  Most of them are similar to ISO-8859 encodings, but
-   * not exactly the same. */
+  // not exactly the same.
 #define IDX_CP437       30
   { "cp437",           ENC_8BIT,               437 },   // like iso-8859-1
 #define IDX_CP737       31
@@ -1066,8 +1066,8 @@ bool utf_printable(int c)
    */
   return iswprint(c);
 #else
-  /* Sorted list of non-overlapping intervals.
+  // Sorted list of non-overlapping intervals.
-   * 0xd800-0xdfff is reserved for UTF-16, actually illegal. */
+  // 0xd800-0xdfff is reserved for UTF-16, actually illegal.
   static struct interval nonprint[] =
   {
     { 0x070f, 0x070f }, { 0x180b, 0x180e }, { 0x200b, 0x200f }, { 0x202a, 0x202e },
@@ -1354,12 +1354,12 @@ static int utf_strnicmp(const char_u *s1, const char_u *s2, size_t n1, size_t n2
     return c1 == 0 ? -1 : 1;
   }
 
-  /* Continue with bytewise comparison to produce some result that
+  // Continue with bytewise comparison to produce some result that
-   * would make comparison operations involving this function transitive.
+  // would make comparison operations involving this function transitive.
-   *
+  //
-   * If only one string had an error, comparison should be made with
+  // If only one string had an error, comparison should be made with
-   * folded version of the other string. In this case it is enough
+  // folded version of the other string. In this case it is enough
-   * to fold just one character to determine the result of comparison. */
+  // to fold just one character to determine the result of comparison.
 
   if (c1 != -1 && c2 == -1) {
     n1 = utf_char2bytes(utf_fold(c1), buffer);
@@ -1637,8 +1637,8 @@ int utf_head_off(const char_u *base, const char_u *p)
     while (q > base && (*q & 0xc0) == 0x80) {
       --q;
     }
-    /* Check for illegal sequence. Do allow an illegal byte after where we
+    // Check for illegal sequence. Do allow an illegal byte after where we
-     * started. */
+    // started.
     len = utf8len_tab[*q];
     if (len != (int)(s - q + 1) && len != (int)(p - q + 1)) {
       return 0;
@@ -2335,8 +2335,8 @@ static char_u *iconv_string(const vimconv_T *const vcp, char_u *str, size_t slen
   fromlen = slen;
   for (;; ) {
     if (len == 0 || ICONV_ERRNO == ICONV_E2BIG) {
-      /* Allocate enough room for most conversions.  When re-allocating
+      // Allocate enough room for most conversions.  When re-allocating
-       * increase the buffer size. */
+      // increase the buffer size.
       len = len + fromlen * 2 + 40;
       p = xmalloc(len);
       if (done > 0) {

src/nvim/memline.c

@@ -200,17 +200,17 @@ struct block0 {
  */
 #define b0_flags        b0_fname[B0_FNAME_SIZE_ORG - 2]
 
-/* The lowest two bits contain the fileformat.  Zero means it's not set
+// The lowest two bits contain the fileformat.  Zero means it's not set
- * (compatible with Vim 6.x), otherwise it's EOL_UNIX + 1, EOL_DOS + 1 or
+// (compatible with Vim 6.x), otherwise it's EOL_UNIX + 1, EOL_DOS + 1 or
- * EOL_MAC + 1. */
+// EOL_MAC + 1.
 #define B0_FF_MASK      3
 
-/* Swap file is in directory of edited file.  Used to find the file from
+// Swap file is in directory of edited file.  Used to find the file from
- * different mount points. */
+// different mount points.
 #define B0_SAME_DIR     4
 
-/* The 'fileencoding' is at the end of b0_fname[], with a NUL in front of it.
+// The 'fileencoding' is at the end of b0_fname[], with a NUL in front of it.
- * When empty there is only the NUL. */
+// When empty there is only the NUL.
 #define B0_HAS_FENC     8
 
 #define STACK_INCR      5       // nr of entries added to ml_stack at a time
@@ -524,9 +524,9 @@ void ml_open_file(buf_T *buf)
 
       // Flush block zero, so others can read it
       if (mf_sync(mfp, MFS_ZERO) == OK) {
-        /* Mark all blocks that should be in the swapfile as dirty.
+        // Mark all blocks that should be in the swapfile as dirty.
-         * Needed for when the 'swapfile' option was reset, so that
+        // Needed for when the 'swapfile' option was reset, so that
-         * the swap file was deleted, and then on again. */
+        // the swap file was deleted, and then on again.
         mf_set_dirty(mfp);
         break;
       }
@@ -580,8 +580,8 @@ void ml_close(buf_T *buf, int del_file)
   XFREE_CLEAR(buf->b_ml.ml_chunksize);
   buf->b_ml.ml_mfp = NULL;
 
-  /* Reset the "recovered" flag, give the ATTENTION prompt the next time
+  // Reset the "recovered" flag, give the ATTENTION prompt the next time
-   * this buffer is loaded. */
+  // this buffer is loaded.
   buf->b_flags &= ~BF_RECOVERED;
 }
 
@@ -860,8 +860,8 @@ void ml_recover(bool checkext)
   /*
    * open the memfile from the old swap file
    */
-  p = vim_strsave(fname_used);   /* save "fname_used" for the message:
+  p = vim_strsave(fname_used);  // save "fname_used" for the message:
-                                    mf_open() will consume "fname_used"! */
+                                // mf_open() will consume "fname_used"!
   mfp = mf_open(fname_used, O_RDONLY);
   fname_used = p;
   if (mfp == NULL || mfp->mf_fd < 0) {
@@ -1199,8 +1199,8 @@ void ml_recover(bool checkext)
    * Line ml_line_count + 1 in the dummy empty line.
    */
   if (orig_file_status != OK || curbuf->b_ml.ml_line_count != lnum * 2 + 1) {
-    /* Recovering an empty file results in two lines and the first line is
+    // Recovering an empty file results in two lines and the first line is
-     * empty.  Don't set the modified flag then. */
+    // empty.  Don't set the modified flag then.
     if (!(curbuf->b_ml.ml_line_count == 2 && *ml_get(1) == NUL)) {
       changed_internal();
       buf_inc_changedtick(curbuf);
@@ -1305,8 +1305,8 @@ int recover_names(char_u *fname, int list, int nr, char_u **fname_out)
 
   if (fname != NULL) {
 #ifdef HAVE_READLINK
-    /* Expand symlink in the file name, because the swap file is created
+    // Expand symlink in the file name, because the swap file is created
-     * with the actual file instead of with the symlink. */
+    // with the actual file instead of with the symlink.
     if (resolve_symlink(fname, fname_buf) == OK) {
       fname_res = fname_buf;
     } else
@@ -1761,9 +1761,9 @@ void ml_preserve(buf_T *buf, int message, bool do_fsync)
     return;
   }
 
-  /* We only want to stop when interrupted here, not when interrupted
+  // We only want to stop when interrupted here, not when interrupted
-   * before. */
+  // before.
-  got_int = FALSE;
+  got_int = false;
 
   ml_flush_line(buf);                               // flush buffered line
   (void)ml_find_line(buf, (linenr_T)0, ML_FLUSH);   // flush locked block
@@ -3222,9 +3222,9 @@ int resolve_symlink(const char_u *fname, char_u *buf)
     ret = readlink((char *)tmp, (char *)buf, MAXPATHL - 1);
     if (ret <= 0) {
       if (errno == EINVAL || errno == ENOENT) {
-        /* Found non-symlink or not existing file, stop here.
+        // Found non-symlink or not existing file, stop here.
-         * When at the first level use the unmodified name, skip the
+        // When at the first level use the unmodified name, skip the
-         * call to vim_FullName(). */
+        // call to vim_FullName().
         if (depth == 1) {
           return FAIL;
         }
@@ -4200,8 +4200,8 @@ long ml_find_line_or_offset(buf_T *buf, linenr_T lnum, long *offp, bool no_ff)
       size += lnum - 1;
     }
 
-    /* Don't count the last line break if 'noeol' and ('bin' or
+    // Don't count the last line break if 'noeol' and ('bin' or
-     * 'nofixeol'). */
+    // 'nofixeol').
     if ((!buf->b_p_fixeol || buf->b_p_bin) && !buf->b_p_eol
         && lnum > buf->b_ml.ml_line_count) {
       size -= ffdos + 1;

src/nvim/menu.c

@@ -343,8 +343,8 @@ static int add_menu_path(const char_u *const menu_path, vimmenu_T *menuarg,
       }
       menup = &menu->next;
 
-      /* Count menus, to find where this one needs to be inserted.
+      // Count menus, to find where this one needs to be inserted.
-       * Ignore menus that are not in the menubar (PopUp and Toolbar) */
+      // Ignore menus that are not in the menubar (PopUp and Toolbar)
       if (parent != NULL || menu_is_menubar(menu->name)) {
         if (menu->priority <= pri_tab[pri_idx]) {
           lower_pri = menup;
@@ -596,8 +596,8 @@ static int remove_menu(vimmenu_T **menup, char_u *name, int modes, bool silent)
         break;
       }
 
-      /* Remove the menu item for the given mode[s].  If the menu item
+      // Remove the menu item for the given mode[s].  If the menu item
-       * is no longer valid in ANY mode, delete it */
+      // is no longer valid in ANY mode, delete it
       menu->modes &= ~modes;
       if (modes & MENU_TIP_MODE) {
         free_menu_string(menu, MENU_INDEX_TIP);

src/nvim/normal.c

@@ -349,8 +349,8 @@ static const struct nv_cmd {
 // Sorted index of commands in nv_cmds[].
 static short nv_cmd_idx[NV_CMDS_SIZE];
 
-/* The highest index for which
+// The highest index for which
- * nv_cmds[idx].cmd_char == nv_cmd_idx[nv_cmds[idx].cmd_char] */
+// nv_cmds[idx].cmd_char == nv_cmd_idx[nv_cmds[idx].cmd_char]
 static int nv_max_linear;
 
 /*
@@ -3623,8 +3623,8 @@ void do_check_scrollbind(bool check)
   static colnr_T old_leftcol = 0;
 
   if (check && curwin->w_p_scb) {
-    /* If a ":syncbind" command was just used, don't scroll, only reset
+    // If a ":syncbind" command was just used, don't scroll, only reset
-     * the values. */
+    // the values.
     if (did_syncbind) {
       did_syncbind = false;
     } else if (curwin == old_curwin) {
@@ -4264,8 +4264,8 @@ void scroll_redraw(int up, long count)
           break;
         }
       }
-      /* Mark w_topline as valid, otherwise the screen jumps back at the
+      // Mark w_topline as valid, otherwise the screen jumps back at the
-       * end of the file. */
+      // end of the file.
       check_cursor_moved(curwin);
       curwin->w_valid |= VALID_TOPLINE;
     }
@@ -4712,9 +4712,9 @@ dozet:
     if (ptr == NULL) {
       pos_T pos = curwin->w_cursor;
 
-      /* Find bad word under the cursor.  When 'spell' is
+      // Find bad word under the cursor.  When 'spell' is
-       * off this fails and find_ident_under_cursor() is
+      // off this fails and find_ident_under_cursor() is
-       * used below. */
+      // used below.
       emsg_off++;
       len = spell_move_to(curwin, FORWARD, true, true, NULL);
       emsg_off--;
@@ -4833,10 +4833,8 @@ static void nv_colon(cmdarg_T *cap)
                && (cap->oap->start.lnum > curbuf->b_ml.ml_line_count
                    || cap->oap->start.col >
                    (colnr_T)STRLEN(ml_get(cap->oap->start.lnum))
-                   || did_emsg
+                   || did_emsg)) {
-                   )) {
+      // The start of the operator has become invalid by the Ex command.
-      /* The start of the operator has become invalid by the Ex command.
-       */
       clearopbeep(cap->oap);
     }
   }
@@ -5667,8 +5665,8 @@ static int normal_search(cmdarg_T *cap, int dir, char_u *pat, int opt, int *wrap
     }
   }
 
-  /* "/$" will put the cursor after the end of the line, may need to
+  // "/$" will put the cursor after the end of the line, may need to
-   * correct that here */
+  // correct that here
   check_cursor();
   return i;
 }
@@ -5848,16 +5846,15 @@ static void nv_brackets(cmdarg_T *cap)
           }
           c = gchar_cursor();
           if (c == '{' || c == '}') {
-            /* Must have found end/start of class: use it.
+            // Must have found end/start of class: use it.
-             * Or found the place to be at. */
+            // Or found the place to be at.
             if ((c == findc && norm) || (n == 1 && !norm)) {
               new_pos = curwin->w_cursor;
               pos = &new_pos;
               n = 0;
-            }
+            } else if (new_pos.lnum == 0) {
-            /* if no match found at all, we started outside of the
+              // if no match found at all, we started outside of the
-             * class and we're inside now.  Just go on. */
+              // class and we're inside now.  Just go on.
-            else if (new_pos.lnum == 0) {
               new_pos = curwin->w_cursor;
               pos = &new_pos;
             }
@@ -6306,8 +6303,8 @@ static void v_swap_corners(int cmdchar)
 
     curwin->w_cursor.lnum = old_cursor.lnum;
     curwin->w_curswant = right;
-    /* 'selection "exclusive" and cursor at right-bottom corner: move it
+    // 'selection "exclusive" and cursor at right-bottom corner: move it
-     * right one column */
+    // right one column
     if (old_cursor.lnum >= VIsual.lnum && *p_sel == 'e') {
       ++curwin->w_curswant;
     }
@@ -6479,8 +6476,8 @@ static void v_visop(cmdarg_T *cap)
 {
   static char_u trans[] = "YyDdCcxdXdAAIIrr";
 
-  /* Uppercase means linewise, except in block mode, then "D" deletes till
+  // Uppercase means linewise, except in block mode, then "D" deletes till
-   * the end of the line, and "C" replaces till EOL */
+  // the end of the line, and "C" replaces till EOL
   if (isupper(cap->cmdchar)) {
     if (VIsual_mode != Ctrl_V) {
       VIsual_mode_orig = VIsual_mode;
@@ -6912,8 +6909,8 @@ static void nv_g_cmd(cmdarg_T *cap)
       VIsual_active = true;
       VIsual_reselect = true;
 
-      /* Set Visual to the start and w_cursor to the end of the Visual
+      // Set Visual to the start and w_cursor to the end of the Visual
-       * area.  Make sure they are on an existing character. */
+      // area.  Make sure they are on an existing character.
       check_cursor();
       VIsual = curwin->w_cursor;
       curwin->w_cursor = tpos;
@@ -6956,10 +6953,9 @@ static void nv_g_cmd(cmdarg_T *cap)
     nv_visual(cap);
     break;
 
-  /* "gn", "gN" visually select next/previous search match
+  // "gn", "gN" visually select next/previous search match
-   * "gn" selects next match
+  // "gn" selects next match
-   * "gN" selects previous match
+  // "gN" selects previous match
-   */
   case 'N':
   case 'n':
     if (!current_search(cap->count1, cap->nchar == 'n')) {
@@ -7033,9 +7029,9 @@ static void nv_g_cmd(cmdarg_T *cap)
     } else {
       i = curwin->w_leftcol;
     }
-    /* Go to the middle of the screen line.  When 'number' or
+    // Go to the middle of the screen line.  When 'number' or
-     * 'relativenumber' is on and lines are wrapping the middle can be more
+    // 'relativenumber' is on and lines are wrapping the middle can be more
-     * to the left. */
+    // to the left.
     if (cap->nchar == 'm') {
       i += (curwin->w_width_inner - curwin_col_off()
             + ((curwin->w_p_wrap && i > 0)
@@ -7683,11 +7679,10 @@ static void nv_wordcmd(cmdarg_T *cap)
  */
 static void adjust_cursor(oparg_T *oap)
 {
-  /* The cursor cannot remain on the NUL when:
+  // The cursor cannot remain on the NUL when:
-   * - the column is > 0
+  // - the column is > 0
-   * - not in Visual mode or 'selection' is "o"
+  // - not in Visual mode or 'selection' is "o"
-   * - 'virtualedit' is not "all" and not "onemore".
+  // - 'virtualedit' is not "all" and not "onemore".
-   */
   if (curwin->w_cursor.col > 0 && gchar_cursor() == NUL
       && (!VIsual_active || *p_sel == 'o')
       && !virtual_active() &&
@@ -7956,8 +7951,8 @@ static void nv_edit(cmdarg_T *cap)
     if (curwin->w_cursor.coladd && cap->cmdchar != 'A') {
       int save_State = State;
 
-      /* Pretend Insert mode here to allow the cursor on the
+      // Pretend Insert mode here to allow the cursor on the
-       * character past the end of the line */
+      // character past the end of the line
       State = INSERT;
       coladvance(getviscol());
       State = save_State;
@@ -7974,9 +7969,9 @@ static void invoke_edit(cmdarg_T *cap, int repl, int cmd, int startln)
 {
   int restart_edit_save = 0;
 
-  /* Complicated: When the user types "a<C-O>a" we don't want to do Insert
+  // Complicated: When the user types "a<C-O>a" we don't want to do Insert
-   * mode recursively.  But when doing "a<C-O>." or "a<C-O>rx" we do allow
+  // mode recursively.  But when doing "a<C-O>." or "a<C-O>rx" we do allow
-   * it. */
+  // it.
   if (repl || !stuff_empty()) {
     restart_edit_save = restart_edit;
   } else {
@@ -8260,8 +8255,8 @@ static void nv_put_opt(cmdarg_T *cap, bool fix_indent)
            && curwin->w_cursor.col < curbuf->b_op_start.col)
           || (VIsual_mode == 'V'
               && curwin->w_cursor.lnum < curbuf->b_op_start.lnum)) {
-        /* cursor is at the end of the line or end of file, put
+        // cursor is at the end of the line or end of file, put
-         * forward. */
+        // forward.
         dir = FORWARD;
       }
       // May have been reset in do_put().
@@ -8275,8 +8270,8 @@ static void nv_put_opt(cmdarg_T *cap, bool fix_indent)
       xfree(savereg);
     }
 
-    /* What to reselect with "gv"?  Selecting the just put text seems to
+    // What to reselect with "gv"?  Selecting the just put text seems to
-     * be the most useful, since the original text was removed. */
+    // be the most useful, since the original text was removed.
     if (was_visual) {
       curbuf->b_visual.vi_start = curbuf->b_op_start;
       curbuf->b_visual.vi_end = curbuf->b_op_end;

src/nvim/ops.c

@@ -435,9 +435,9 @@ static void shift_block(oparg_T *oap, int amount)
      * non-whitespace character.
      */
 
-    /* If "bd.startspaces" is set, "bd.textstart" points to the character,
+    // If "bd.startspaces" is set, "bd.textstart" points to the character,
-     * the part of which is displayed at the block's beginning. Let's start
+    // the part of which is displayed at the block's beginning. Let's start
-     * searching from the next character. */
+    // searching from the next character.
     if (bd.startspaces) {
       MB_PTR_ADV(non_white);
     }
@@ -614,8 +614,8 @@ static void block_insert(oparg_T *oap, char_u *s, int b_insert, struct block_def
                         skipped, offset-startcol, kExtmarkUndo);
 
     if (lnum == oap->end.lnum) {
-      /* Set "']" mark to the end of the block instead of the end of
+      // Set "']" mark to the end of the block instead of the end of
-       * the insert in the first line.  */
+      // the insert in the first line.
       curbuf->b_op_end.lnum = oap->end.lnum;
       curbuf->b_op_end.col = offset;
     }
@@ -1846,8 +1846,8 @@ int op_replace(oparg_T *oap, int c)
         numc -= (oap->end_vcol - bd.end_vcol) + 1;
       }
 
-      /* A double-wide character can be replaced only up to half the
+      // A double-wide character can be replaced only up to half the
-       * times. */
+      // times.
       if ((*mb_char2cells)(c) > 1) {
         if ((numc & 1) && !bd.is_short) {
           ++bd.endspaces;
@@ -1938,8 +1938,8 @@ int op_replace(oparg_T *oap, int c)
       n = gchar_cursor();
       if (n != NUL) {
         if ((*mb_char2len)(c) > 1 || (*mb_char2len)(n) > 1) {
-          /* This is slow, but it handles replacing a single-byte
+          // This is slow, but it handles replacing a single-byte
-           * with a multi-byte and the other way around. */
+          // with a multi-byte and the other way around.
           if (curwin->w_cursor.lnum == oap->end.lnum) {
             oap->end.col += (*mb_char2len)(c) - (*mb_char2len)(n);
           }
@@ -1949,8 +1949,8 @@ int op_replace(oparg_T *oap, int c)
             int end_vcol = 0;
 
             if (curwin->w_cursor.lnum == oap->end.lnum) {
-              /* oap->end has to be recalculated when
+              // oap->end has to be recalculated when
-               * the tab breaks */
+              // the tab breaks
               end_vcol = getviscol2(oap->end.col,
                                     oap->end.coladd);
             }
@@ -1969,9 +1969,9 @@ int op_replace(oparg_T *oap, int c)
           virtcols -= oap->start.coladd;
         }
 
-        /* oap->end has been trimmed so it's effectively inclusive;
+        // oap->end has been trimmed so it's effectively inclusive;
-         * as a result an extra +1 must be counted so we don't
+        // as a result an extra +1 must be counted so we don't
-         * trample the NUL byte. */
+        // trample the NUL byte.
         coladvance_force(getviscol2(oap->end.col, oap->end.coladd) + 1);
         curwin->w_cursor.col -= (virtcols + 1);
         for (; virtcols >= 0; virtcols--) {
@@ -2228,8 +2228,8 @@ void op_insert(oparg_T *oap, long count1)
         ++curwin->w_cursor.col;
       }
       if (bd.is_short && !bd.is_MAX) {
-        /* First line was too short, make it longer and adjust the
+        // First line was too short, make it longer and adjust the
-         * values in "bd". */
+        // values in "bd".
         if (u_save_cursor() == FAIL) {
           return;
         }
@@ -2386,8 +2386,8 @@ int op_change(oparg_T *oap)
     }
   }
 
-  /* First delete the text in the region.  In an empty buffer only need to
+  // First delete the text in the region.  In an empty buffer only need to
-   * save for undo */
+  // save for undo
   if (curbuf->b_ml.ml_flags & ML_EMPTY) {
     if (u_save_cursor() == FAIL) {
       return FALSE;
@@ -3872,10 +3872,9 @@ char_u *skip_comment(char_u *line, bool process, bool include_space, bool *is_co
     ++comment_flags;
   }
 
-  /* If we found a colon, it means that we are not processing a line
+  // If we found a colon, it means that we are not processing a line
-   * starting with a closing part of a three-part comment. That's good,
+  // starting with a closing part of a three-part comment. That's good,
-   * because we don't want to remove those as this would be annoying.
+  // because we don't want to remove those as this would be annoying.
-   */
   if (*comment_flags == ':' || *comment_flags == NUL) {
     line += lead_len;
   }
@@ -4054,8 +4053,8 @@ int do_join(size_t count, int insert_space, int save_undo, int use_formatoptions
     curwin->w_buffer->b_op_end.col = sumsize;
   }
 
-  /* Only report the change in the first line here, del_lines() will report
+  // Only report the change in the first line here, del_lines() will report
-   * the deleted line. */
+  // the deleted line.
   changed_lines(curwin->w_cursor.lnum, currsize,
                 curwin->w_cursor.lnum + 1, 0L, true);
 
@@ -4172,8 +4171,8 @@ void op_format(oparg_T *oap, int keep_cursor)
 {
   long old_line_count = curbuf->b_ml.ml_line_count;
 
-  /* Place the cursor where the "gq" or "gw" command was given, so that "u"
+  // Place the cursor where the "gq" or "gw" command was given, so that "u"
-   * can put it back there. */
+  // can put it back there.
   curwin->w_cursor = oap->cursor_start;
 
   if (u_save((linenr_T)(oap->start.lnum - 1),
@@ -4190,8 +4189,8 @@ void op_format(oparg_T *oap, int keep_cursor)
   // Set '[ mark at the start of the formatted area
   curbuf->b_op_start = oap->start;
 
-  /* For "gw" remember the cursor position and put it back below (adjusted
+  // For "gw" remember the cursor position and put it back below (adjusted
-   * for joined and split lines). */
+  // for joined and split lines).
   if (keep_cursor) {
     saved_cursor = oap->cursor_start;
   }
@@ -4221,8 +4220,8 @@ void op_format(oparg_T *oap, int keep_cursor)
   if (oap->is_VIsual) {
     FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
       if (wp->w_old_cursor_lnum != 0) {
-        /* When lines have been inserted or deleted, adjust the end of
+        // When lines have been inserted or deleted, adjust the end of
-         * the Visual area to be redrawn. */
+        // the Visual area to be redrawn.
         if (wp->w_old_cursor_lnum > wp->w_old_visual_lnum) {
           wp->w_old_cursor_lnum += old_line_count;
         } else {
@@ -4244,9 +4243,9 @@ void op_formatexpr(oparg_T *oap)
   }
 
   if (fex_format(oap->start.lnum, oap->line_count, NUL) != 0) {
-    /* As documented: when 'formatexpr' returns non-zero fall back to
+    // As documented: when 'formatexpr' returns non-zero fall back to
-     * internal formatting. */
+    // internal formatting.
-    op_format(oap, FALSE);
+    op_format(oap, false);
   }
 }
 
@@ -4424,8 +4423,8 @@ void format_lines(linenr_T line_count, int avoid_fex)
        */
       if (is_end_par || force_format) {
         if (need_set_indent) {
-          /* replace indent in first line with minimal number of
+          // replace indent in first line with minimal number of
-           * tabs and spaces, according to current options */
+          // tabs and spaces, according to current options
           (void)set_indent(get_indent(), SIN_CHANGED);
         }
 
@@ -4451,8 +4450,8 @@ void format_lines(linenr_T line_count, int avoid_fex)
         // at end of par.: need to set indent of next par.
         need_set_indent = is_end_par;
         if (is_end_par) {
-          /* When called with a negative line count, break at the
+          // When called with a negative line count, break at the
-           * end of the paragraph. */
+          // end of the paragraph.
           if (line_count < 0) {
             break;
           }
@@ -4674,9 +4673,9 @@ static void block_prep(oparg_T *oap, struct block_def *bdp, linenr_T lnum, bool
       } else {
         bdp->startspaces = oap->end_vcol - oap->start_vcol + 1;
         if (is_del && oap->op_type != OP_LSHIFT) {
-          /* just putting the sum of those two into
+          // just putting the sum of those two into
-           * bdp->startspaces doesn't work for Visual replace,
+          // bdp->startspaces doesn't work for Visual replace,
-           * so we have to split the tab in two */
+          // so we have to split the tab in two
           bdp->startspaces = bdp->start_char_vcols
                              - (bdp->start_vcol - oap->start_vcol);
           bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1;

src/nvim/option.c

@@ -615,8 +615,8 @@ static void set_option_default(int opt_idx, int opt_flags)
   uint32_t flags = options[opt_idx].flags;
   if (varp != NULL) {       // skip hidden option, nothing to do for it
     if (flags & P_STRING) {
-      /* Use set_string_option_direct() for local options to handle
+      // Use set_string_option_direct() for local options to handle
-       * freeing and allocating the value. */
+      // freeing and allocating the value.
       if (options[opt_idx].indir != PV_NONE) {
         set_string_option_direct(NULL, opt_idx,
                                  options[opt_idx].def_val, opt_flags, 0);
@@ -1094,8 +1094,8 @@ int do_set(char_u *arg, int opt_flags)
         flags = P_STRING;
       }
 
-      /* Skip all options that are not window-local (used when showing
+      // Skip all options that are not window-local (used when showing
-       * an already loaded buffer in a window). */
+      // an already loaded buffer in a window).
       if ((opt_flags & OPT_WINONLY)
           && (opt_idx < 0 || options[opt_idx].var != VAR_WIN)) {
         goto skip;
@@ -1514,8 +1514,8 @@ int do_set(char_u *arg, int opt_flags)
                 }
               }
 
-              /* concatenate the two strings; add a ',' if
+              // concatenate the two strings; add a ',' if
-               * needed */
+              // needed
               if (adding || prepending) {
                 comma = ((flags & P_COMMA) && *origval != NUL
                          && *newval != NUL);
@@ -1540,8 +1540,8 @@ int do_set(char_u *arg, int opt_flags)
                 }
               }
 
-              /* Remove newval[] from origval[]. (Note: "i" has
+              // Remove newval[] from origval[]. (Note: "i" has
-               * been set above and is used here). */
+              // been set above and is used here).
               if (removing) {
                 STRCPY(newval, origval);
                 if (*s) {
@@ -4044,8 +4044,8 @@ static char *set_bool_option(const int opt_idx, char_u *const varp, const int va
         }
       }
 
-      /* Arabic requires a utf-8 encoding, inform the user if its not
+      // Arabic requires a utf-8 encoding, inform the user if its not
-       * set. */
+      // set.
       if (STRCMP(p_enc, "utf-8") != 0) {
         static char *w_arabic = N_("W17: Arabic requires UTF-8, do ':set encoding=utf-8'");
 
@@ -4070,12 +4070,12 @@ static char *set_bool_option(const int opt_idx, char_u *const varp, const int va
           changed_window_setting();
         }
 
-        /* 'arabicshape' isn't reset, it is a global option and
+        // 'arabicshape' isn't reset, it is a global option and
-         * another window may still need it "on". */
+        // another window may still need it "on".
       }
 
-      /* 'delcombine' isn't reset, it is a global option and another
+      // 'delcombine' isn't reset, it is a global option and another
-       * window may still want it "on". */
+      // window may still want it "on".
 
       // Revert to the default keymap
       curbuf->b_p_iminsert = B_IMODE_NONE;
@@ -5218,8 +5218,8 @@ int makeset(FILE *fd, int opt_flags, int local_only)
           continue;
         }
 
-        /* Do not store options like 'bufhidden' and 'syntax' in a vimrc
+        // Do not store options like 'bufhidden' and 'syntax' in a vimrc
-         * file, they are always buffer-specific. */
+        // file, they are always buffer-specific.
         if ((opt_flags & OPT_GLOBAL) && (p->flags & P_NOGLOB)) {
           continue;
         }
@@ -5339,9 +5339,9 @@ static int put_setstring(FILE *fd, char *cmd, char *name, char_u **valuep, uint6
     return FAIL;
   }
   if (*valuep != NULL) {
-    /* Output 'pastetoggle' as key names.  For other
+    // Output 'pastetoggle' as key names.  For other
-     * options some characters have to be escaped with
+    // options some characters have to be escaped with
-     * CTRL-V or backslash */
+    // CTRL-V or backslash
     if (valuep == &p_pt) {
       s = *valuep;
       while (*s != NUL) {
@@ -6605,8 +6605,8 @@ void ExpandOldSetting(int *num_file, char_u ***file)
   char_u *buf = vim_strsave_escaped(var, escape_chars);
 
 #ifdef BACKSLASH_IN_FILENAME
-  /* For MS-Windows et al. we don't double backslashes at the start and
+  // For MS-Windows et al. we don't double backslashes at the start and
-   * before a file name character. */
+  // before a file name character.
   for (var = buf; *var != NUL; MB_PTR_ADV(var)) {
     if (var[0] == '\\' && var[1] == '\\'
         && expand_option_idx >= 0

src/nvim/regexp.c

@@ -3005,8 +3005,8 @@ static void ungetchr(void)
   at_start = prev_at_start;
   prev_at_start = false;
 
-  /* Backup regparse, so that it's at the same position as before the
+  // Backup regparse, so that it's at the same position as before the
-   * getchr(). */
+  // getchr().
   regparse -= prevchr_len;
 }
 
@@ -6414,8 +6414,8 @@ static int cstrncmp(char_u *s1, char_u *s2, int *n)
     int c1, c2, c11, c12;
     int junk;
 
-    /* we have to handle the strcmp ourselves, since it is necessary to
+    // we have to handle the strcmp ourselves, since it is necessary to
-     * deal with the composing characters by ignoring them: */
+    // deal with the composing characters by ignoring them:
     str1 = s1;
     str2 = s2;
     c1 = c2 = 0;
@@ -7186,8 +7186,8 @@ static regengine_T nfa_regengine =
   (char_u *)""
 };
 
-/* Which regexp engine to use? Needed for vim_regcomp().
+// Which regexp engine to use? Needed for vim_regcomp().
- * Must match with 'regexpengine'. */
+// Must match with 'regexpengine'.
 static int regexp_engine = 0;
 
 #ifdef REGEXP_DEBUG

src/nvim/regexp_nfa.c

@@ -374,8 +374,8 @@ nfa_regcomp_start (
   /* A reasonable estimation for maximum size */
   nstate_max = (STRLEN(expr) + 1) * 25;
 
-  /* Some items blow up in size, such as [A-z].  Add more space for that.
+  // Some items blow up in size, such as [A-z].  Add more space for that.
-   * When it is still not enough realloc_post_list() will be used. */
+  // When it is still not enough realloc_post_list() will be used.
   nstate_max += 1000;
 
   /* Size for postfix representation of expr. */
@@ -1426,8 +1426,8 @@ static int nfa_regatom(void)
     }
     break;
 
-    /* Catch \%^ and \%$ regardless of where they appear in the
+    // Catch \%^ and \%$ regardless of where they appear in the
-     * pattern -- regardless of whether or not it makes sense. */
+    // pattern -- regardless of whether or not it makes sense.
     case '^':
       EMIT(NFA_BOF);
       break;
@@ -1468,13 +1468,13 @@ static int nfa_regatom(void)
       EMIT(NFA_OPT_CHARS);
       EMIT(n);
 
-      /* Emit as "\%(\%[abc]\)" to be able to handle
+      // Emit as "\%(\%[abc]\)" to be able to handle
-       * "\%[abc]*" which would cause the empty string to be
+      // "\%[abc]*" which would cause the empty string to be
-       * matched an unlimited number of times. NFA_NOPEN is
+      // matched an unlimited number of times. NFA_NOPEN is
-       * added only once at a position, while NFA_SPLIT is
+      // added only once at a position, while NFA_SPLIT is
-       * added multiple times.  This is more efficient than
+      // added multiple times.  This is more efficient than
-       * not allowing NFA_SPLIT multiple times, it is used
+      // not allowing NFA_SPLIT multiple times, it is used
-       * a lot. */
+      // a lot.
       EMIT(NFA_NOPEN);
       break;
     }
@@ -1884,8 +1884,8 @@ static int nfa_regpiece(void)
   int my_post_start;
   int quest;
 
-  /* Save the current parse state, so that we can use it if <atom>{m,n} is
+  // Save the current parse state, so that we can use it if <atom>{m,n} is
-   * next. */
+  // next.
   save_parse_state(&old_state);
 
   /* store current pos in the postfix form, for \{m,n} involving 0s */
@@ -1969,12 +1969,11 @@ static int nfa_regpiece(void)
     break;
 
   case Magic('{'):
-    /* a{2,5} will expand to 'aaa?a?a?'
+    // a{2,5} will expand to 'aaa?a?a?'
-     * a{-1,3} will expand to 'aa??a??', where ?? is the nongreedy
+    // a{-1,3} will expand to 'aa??a??', where ?? is the nongreedy
-     * version of '?'
+    // version of '?'
-     * \v(ab){2,3} will expand to '(ab)(ab)(ab)?', where all the
+    // \v(ab){2,3} will expand to '(ab)(ab)(ab)?', where all the
-     * parenthesis have the same id
+    // parenthesis have the same id
-     */
 
     greedy = true;
     c2 = peekchr();
@@ -1985,8 +1984,8 @@ static int nfa_regpiece(void)
     if (!read_limits(&minval, &maxval))
       EMSG_RET_FAIL(_("E870: (NFA regexp) Error reading repetition limits"));
 
-    /*  <atom>{0,inf}, <atom>{0,} and <atom>{}  are equivalent to
+    //  <atom>{0,inf}, <atom>{0,} and <atom>{}  are equivalent to
-     *  <atom>*  */
+    //  <atom>*
     if (minval == 0 && maxval == MAX_LIMIT) {
       if (greedy)
         /* \{}, \{0,} */
@@ -3329,10 +3328,10 @@ static nfa_state_T *post2nfa(int *postfix, int *end, int nfa_calc_size)
         break;
       }
 
-      /* Allow "NFA_MOPEN" as a valid postfix representation for
+      // Allow "NFA_MOPEN" as a valid postfix representation for
-       * the empty regexp "". In this case, the NFA will be
+      // the empty regexp "". In this case, the NFA will be
-       * NFA_MOPEN -> NFA_MCLOSE. Note that this also allows
+      // NFA_MOPEN -> NFA_MCLOSE. Note that this also allows
-       * empty groups of parenthesis, and empty mbyte chars */
+      // empty groups of parenthesis, and empty mbyte chars
       if (stackp == stack) {
         s = alloc_state(mopen, NULL, NULL);
         if (s == NULL)
@@ -3345,8 +3344,8 @@ static nfa_state_T *post2nfa(int *postfix, int *end, int nfa_calc_size)
         break;
       }
 
-      /* At least one node was emitted before NFA_MOPEN, so
+      // At least one node was emitted before NFA_MOPEN, so
-       * at least one node will be between NFA_MOPEN and NFA_MCLOSE */
+      // at least one node will be between NFA_MOPEN and NFA_MCLOSE
       e = POP();
       s = alloc_state(mopen, e.start, NULL);         /* `(' */
       if (s == NULL)
@@ -3503,14 +3502,14 @@ static void nfa_postprocess(nfa_regprog_T *prog)
         int ch_invisible = failure_chance(prog->state[i].out, 0);
         int ch_follows = failure_chance(prog->state[i].out1->out, 0);
 
-        /* Postpone when the invisible match is expensive or has a
+        // Postpone when the invisible match is expensive or has a
-         * lower chance of failing. */
+        // lower chance of failing.
         if (c == NFA_START_INVISIBLE_BEFORE
             || c == NFA_START_INVISIBLE_BEFORE_NEG) {
-          /* "before" matches are very expensive when
+          // "before" matches are very expensive when
-           * unbounded, always prefer what follows then,
+          // unbounded, always prefer what follows then,
-           * unless what follows will always match.
+          // unless what follows will always match.
-           * Otherwise strongly prefer what follows. */
+          // Otherwise strongly prefer what follows.
           if (prog->state[i].val <= 0 && ch_follows > 0) {
             directly = false;
           } else {
@@ -3529,9 +3528,9 @@ static void nfa_postprocess(nfa_regprog_T *prog)
   }
 }
 
-/****************************************************************
+/////////////////////////////////////////////////////////////////
-* NFA execution code.
+// NFA execution code.
-****************************************************************/
+/////////////////////////////////////////////////////////////////
 
 /* Values for done in nfa_pim_T. */
 #define NFA_PIM_UNUSED   0      /* pim not used */
@@ -4197,8 +4196,8 @@ skip_add:
     save_ptr = NULL;
     memset(&save_multipos, 0, sizeof(save_multipos));
 
-    /* Set the position (with "off" added) in the subexpression.  Save
+    // Set the position (with "off" added) in the subexpression.  Save
-     * and restore it when it was in use.  Otherwise fill any gap. */
+    // and restore it when it was in use.  Otherwise fill any gap.
     if (REG_MULTI) {
       if (subidx < sub->in_use) {
         save_multipos = sub->list.multi[subidx];
@@ -4297,8 +4296,8 @@ skip_add:
       sub = &subs->norm;
     }
 
-    /* We don't fill in gaps here, there must have been an MOPEN that
+    // We don't fill in gaps here, there must have been an MOPEN that
-     * has done that. */
+    // has done that.
     save_in_use = sub->in_use;
     if (sub->in_use <= subidx)
       sub->in_use = subidx + 1;

src/nvim/screen.c

@@ -5164,8 +5164,8 @@ void win_redr_status_matches(expand_T *xp, int num_matches, char_u **matches, in
   if (row >= 0) {
     if (wild_menu_showing == 0 || wild_menu_showing == WM_LIST) {
       if (msg_scrolled > 0) {
-        /* Put the wildmenu just above the command line.  If there is
+        // Put the wildmenu just above the command line.  If there is
-         * no room, scroll the screen one line up. */
+        // no room, scroll the screen one line up.
         if (cmdline_row == Rows - 1) {
           msg_scroll_up(false);
           msg_scrolled++;
@@ -7031,8 +7031,8 @@ int showmode(void)
         if (VIsual_active) {
           char *p;
 
-          /* Don't concatenate separate words to avoid translation
+          // Don't concatenate separate words to avoid translation
-           * problems. */
+          // problems.
           switch ((VIsual_select ? 4 : 0)
                   + (VIsual_mode == Ctrl_V) * 2
                   + (VIsual_mode == 'V')) {

src/nvim/search.c

@@ -839,14 +839,14 @@ int searchit(win_T *win, buf_T *buf, pos_T *pos, pos_T *end_pos, Direction dir,
             }
           }
 
-          /* With the SEARCH_END option move to the last character
+          // With the SEARCH_END option move to the last character
-           * of the match.  Don't do it for an empty match, end
+          // of the match.  Don't do it for an empty match, end
-           * should be same as start then. */
+          // should be same as start then.
           if ((options & SEARCH_END) && !(options & SEARCH_NOOF)
               && !(matchpos.lnum == endpos.lnum
                    && matchpos.col == endpos.col)) {
-            /* For a match in the first column, set the position
+            // For a match in the first column, set the position
-             * on the NUL in the previous line. */
+            // on the NUL in the previous line.
             pos->lnum = lnum + endpos.lnum;
             pos->col = endpos.col;
             if (endpos.col == 0) {
@@ -1498,8 +1498,8 @@ int search_for_exact_line(buf_T *buf, pos_T *pos, Direction dir, char_u *pat)
     p = skipwhite(ptr);
     pos->col = (colnr_T)(p - ptr);
 
-    /* when adding lines the matching line may be empty but it is not
+    // when adding lines the matching line may be empty but it is not
-     * ignored because we are interested in the next line -- Acevedo */
+    // ignored because we are interested in the next line -- Acevedo
     if ((compl_cont_status & CONT_ADDING)
         && !(compl_cont_status & CONT_SOL)) {
       if (mb_strcmp_ic((bool)p_ic, (const char *)p, (const char *)pat) == 0) {
@@ -1566,9 +1566,9 @@ int searchc(cmdarg_T *cap, int t_cmd)
     c = *lastc;
     // For multi-byte re-use last lastc_bytes[] and lastc_bytelen.
 
-    /* Force a move of at least one char, so ";" and "," will move the
+    // Force a move of at least one char, so ";" and "," will move the
-     * cursor, even if the cursor is right in front of char we are looking
+    // cursor, even if the cursor is right in front of char we are looking
-     * at. */
+    // at.
     if (vim_strchr(p_cpo, CPO_SCOLON) == NULL && count == 1 && t_cmd) {
       stop = false;
     }
@@ -2084,10 +2084,10 @@ pos_T *findmatchlimit(oparg_T *oap, int initc, int flags, int64_t maxtravel)
           if (linep[pos.col - 1] == 'R'
               && linep[pos.col] == '"'
               && vim_strchr(linep + pos.col + 1, '(') != NULL) {
-            /* Possible start of raw string. Now that we have the
+            // Possible start of raw string. Now that we have the
-             * delimiter we can check if it ends before where we
+            // delimiter we can check if it ends before where we
-             * started searching, or before the previously found
+            // started searching, or before the previously found
-             * raw string start. */
+            // raw string start.
             if (!find_rawstring_end(linep, &pos,
                                     count > 0 ? &match_pos : &curwin->w_cursor)) {
               count++;
@@ -2208,8 +2208,8 @@ pos_T *findmatchlimit(oparg_T *oap, int initc, int flags, int64_t maxtravel)
       break;
 
     case '"':
-      /* a quote that is preceded with an odd number of backslashes is
+      // a quote that is preceded with an odd number of backslashes is
-       * ignored */
+      // ignored
       if (do_quotes) {
         int col;
 
@@ -2282,8 +2282,8 @@ pos_T *findmatchlimit(oparg_T *oap, int initc, int flags, int64_t maxtravel)
             bslcnt++;
           }
         }
-        /* Only accept a match when 'M' is in 'cpo' or when escaping
+        // Only accept a match when 'M' is in 'cpo' or when escaping
-         * is what we expect. */
+        // is what we expect.
         if (cpo_bsl || (bslcnt & 1) == match_escaped) {
           if (c == initc) {
             count++;
@@ -3505,8 +3505,8 @@ int current_block(oparg_T *oap, long count, int include, int what, int other)
       // Include the character under the cursor.
       oap->inclusive = true;
     } else {
-      /* End is before the start (no text in between <>, [], etc.): don't
+      // End is before the start (no text in between <>, [], etc.): don't
-       * operate on any text. */
+      // operate on any text.
       curwin->w_cursor = start_pos;
     }
   }
@@ -4044,8 +4044,8 @@ bool current_quote(oparg_T *oap, long count, bool include, int quotechar)
   }
 
   if (!vis_empty) {
-    /* Check if the existing selection exactly spans the text inside
+    // Check if the existing selection exactly spans the text inside
-     * quotes. */
+    // quotes.
     if (vis_bef_curs) {
       inside_quotes = VIsual.col > 0
                       && line[VIsual.col - 1] == quotechar
@@ -4072,11 +4072,11 @@ bool current_quote(oparg_T *oap, long count, bool include, int quotechar)
   }
 
   if (!vis_empty && line[col_start] == quotechar) {
-    /* Already selecting something and on a quote character.  Find the
+    // Already selecting something and on a quote character.  Find the
-     * next quoted string. */
+    // next quoted string.
     if (vis_bef_curs) {
-      /* Assume we are on a closing quote: move to after the next
+      // Assume we are on a closing quote: move to after the next
-       * opening quote. */
+      // opening quote.
       col_start = find_next_quote(line, col_start + 1, quotechar, NULL);
       if (col_start < 0) {
         goto abort_search;
@@ -4800,8 +4800,8 @@ void find_pattern_in_path(char_u *ptr, Direction dir, size_t len, bool whole, bo
   file_line = xmalloc(LSIZE);
 
   if (type != CHECK_PATH && type != FIND_DEFINE
-      /* when CONT_SOL is set compare "ptr" with the beginning of the line
+      // when CONT_SOL is set compare "ptr" with the beginning of the line
-       * is faster than quote_meta/regcomp/regexec "ptr" -- Acevedo */
+      // is faster than quote_meta/regcomp/regexec "ptr" -- Acevedo
       && !(compl_cont_status & CONT_SOL)) {
     pat = xmalloc(len + 5);
     assert(len <= INT_MAX);
@@ -4946,10 +4946,9 @@ void find_pattern_in_path(char_u *ptr, Direction dir, size_t len, bool whole, bo
               // Nothing found, use the rest of the line.
               p = incl_regmatch.endp[0];
               i = (int)STRLEN(p);
-            }
+            } else if (p > line) {
-            /* Avoid checking before the start of the line, can
+              // Avoid checking before the start of the line, can
-             * happen if \zs appears in the regexp. */
+              // happen if \zs appears in the regexp.
-            else if (p > line) {
               if (p[-1] == '"' || p[-1] == '<') {
                 --p;
                 ++i;
@@ -5129,9 +5128,9 @@ search_line:
           // IOSIZE > compl_length, so the STRNCPY works
           STRNCPY(IObuff, aux, i);
 
-          /* Get the next line: when "depth" < 0  from the current
+          // Get the next line: when "depth" < 0  from the current
-           * buffer, otherwise from the included file.  Jump to
+          // buffer, otherwise from the included file.  Jump to
-           * exit_matched when past the last line. */
+          // exit_matched when past the last line.
           if (depth < 0) {
             if (lnum >= end_lnum) {
               goto exit_matched;
@@ -5142,9 +5141,9 @@ search_line:
             goto exit_matched;
           }
 
-          /* we read a line, set "already" to check this "line" later
+          // we read a line, set "already" to check this "line" later
-           * if depth >= 0 we'll increase files[depth].lnum far
+          // if depth >= 0 we'll increase files[depth].lnum far
-           * bellow  -- Acevedo */
+          // bellow  -- Acevedo
           already = aux = p = skipwhite(line);
           p = find_word_start(p);
           p = find_word_end(p);
@@ -5195,8 +5194,8 @@ search_line:
           if (did_show) {
             msg_putchar('\n');                  // cursor below last one
           }
-          if (!got_int) {                       /* don't display if 'q' typed
+          if (!got_int) {             // don't display if 'q' typed
-                                                    at "--more--" message */
+                                      // at "--more--" message
             msg_home_replace_hl(curr_fname);
           }
           prev_fname = curr_fname;
@@ -5209,10 +5208,10 @@ search_line:
                            match_count++);
         }
 
-        /* Set matched flag for this file and all the ones that
+        // Set matched flag for this file and all the ones that
-         * include it */
+        // include it
-        for (i = 0; i <= depth; ++i) {
+        for (i = 0; i <= depth; i++) {
-          files[i].matched = TRUE;
+          files[i].matched = true;
         }
       } else if (--count <= 0) {
         found = true;

src/nvim/spellfile.c

@@ -2602,7 +2602,7 @@ static afffile_T *spell_read_aff(spellinfo_T *spin, char_u *fname)
         upp = vim_strsave(items[1]);
       } else if (is_aff_rule(items, itemcnt, "REP", 2)
                  || is_aff_rule(items, itemcnt, "REPSAL", 2)) {
-        /* Ignore REP/REPSAL count */;
+        // Ignore REP/REPSAL count
         if (!isdigit(*items[1])) {
           smsg(_("Expected REP(SAL) count in %s line %d"),
                fname, lnum);

src/nvim/syntax.c

@@ -230,11 +230,10 @@ struct name_list {
 static char *(spo_name_tab[SPO_COUNT]) =
 { "ms=", "me=", "hs=", "he=", "rs=", "re=", "lc=" };
 
-/* The sp_off_flags are computed like this:
+// The sp_off_flags are computed like this:
- * offset from the start of the matched text: (1 << SPO_XX_OFF)
+// offset from the start of the matched text: (1 << SPO_XX_OFF)
- * offset from the end   of the matched text: (1 << (SPO_XX_OFF + SPO_COUNT))
+// offset from the end   of the matched text: (1 << (SPO_XX_OFF + SPO_COUNT))
- * When both are present, only one is used.
+// When both are present, only one is used.
- */
 
 #define SPTYPE_MATCH    1       // match keyword with this group ID
 #define SPTYPE_START    2       // match a regexp, start of item
@@ -492,8 +491,8 @@ void syntax_start(win_T *wp, linenr_T lnum)
       // First line is always valid, no matter "minlines".
       first_stored = 1;
     } else {
-      /* Need to parse "minlines" lines before state can be considered
+      // Need to parse "minlines" lines before state can be considered
-       * valid to store. */
+      // valid to store.
       first_stored = current_lnum + syn_block->b_syn_sync_minlines;
     }
   } else {
@@ -514,12 +513,12 @@ void syntax_start(win_T *wp, linenr_T lnum)
     (void)syn_finish_line(false);
     current_lnum++;
 
-    /* If we parsed at least "minlines" lines or started at a valid
+    // If we parsed at least "minlines" lines or started at a valid
-     * state, the current state is considered valid. */
+    // state, the current state is considered valid.
     if (current_lnum >= first_stored) {
-      /* Check if the saved state entry is for the current line and is
+      // Check if the saved state entry is for the current line and is
-       * equal to the current state.  If so, then validate all saved
+      // equal to the current state.  If so, then validate all saved
-       * states that depended on a change before the parsed line. */
+      // states that depended on a change before the parsed line.
       if (prev == NULL) {
         prev = syn_stack_find_entry(current_lnum - 1);
       }
@@ -548,19 +547,18 @@ void syntax_start(win_T *wp, linenr_T lnum)
           sp = sp->sst_next;
         }
         load_current_state(prev);
-      }
+      } else if (prev == NULL
-      /* Store the state at this line when it's the first one, the line
+                 // Store the state at this line when it's the first one, the line
-       * where we start parsing, or some distance from the previously
+                 // where we start parsing, or some distance from the previously
-       * saved state.  But only when parsed at least 'minlines'. */
+                 // saved state.  But only when parsed at least 'minlines'.
-      else if (prev == NULL
                  || current_lnum == lnum
                  || current_lnum >= prev->sst_lnum + dist) {
         prev = store_current_state();
       }
     }
 
-    /* This can take a long time: break when CTRL-C pressed.  The current
+    // This can take a long time: break when CTRL-C pressed.  The current
-     * state will be wrong then. */
+    // state will be wrong then.
     line_breakcheck();
     if (got_int) {
       current_lnum = lnum;
@@ -664,8 +662,8 @@ static void syn_sync(win_T *wp, linenr_T start_lnum, synstate_T *last_valid)
    * 1. Search backwards for the end of a C-style comment.
    */
   if (syn_block->b_syn_sync_flags & SF_CCOMMENT) {
-    /* Need to make syn_buf the current buffer for a moment, to be able to
+    // Need to make syn_buf the current buffer for a moment, to be able to
-     * use find_start_comment(). */
+    // use find_start_comment().
     curwin_save = curwin;
     curwin = wp;
     curbuf_save = curbuf;
@@ -793,9 +791,9 @@ static void syn_sync(win_T *wp, linenr_T start_lnum, synstate_T *last_valid)
               ++current_col;
             }
 
-            /* syn_current_attr() will have skipped the check for
+            // syn_current_attr() will have skipped the check for
-             * an item that ends here, need to do that now.  Be
+            // an item that ends here, need to do that now.  Be
-             * careful not to go past the NUL. */
+            // careful not to go past the NUL.
             prev_current_col = current_col;
             if (syn_getcurline()[current_col] != NUL) {
               ++current_col;
@@ -987,9 +985,8 @@ static void syn_update_ends(bool startofline)
   check_keepend();
 }
 
-/****************************************
+/////////////////////////////////////////
- * Handling of the state stack cache.
+// Handling of the state stack cache.
- */
 
 /*
  * EXPLANATION OF THE SYNTAX STATE STACK CACHE
@@ -1081,8 +1078,8 @@ static void syn_stack_alloc(void)
     }
 
     if (syn_block->b_sst_array != NULL) {
-      /* When shrinking the array, cleanup the existing stack.
+      // When shrinking the array, cleanup the existing stack.
-       * Make sure that all valid entries fit in the new array. */
+      // Make sure that all valid entries fit in the new array.
       while (syn_block->b_sst_len - syn_block->b_sst_freecount + 2 > len
              && syn_stack_cleanup()) {
         ;
@@ -1165,9 +1162,9 @@ static void syn_stack_apply_changes_block(synblock_T *block, buf_T *buf)
         p = np;
         continue;
       }
-      /* This state is below the changed area.  Remember the line
+      // This state is below the changed area.  Remember the line
-       * that needs to be parsed before this entry can be made valid
+      // that needs to be parsed before this entry can be made valid
-       * again. */
+      // again.
       if (p->sst_change_lnum != 0 && p->sst_change_lnum > buf->b_mod_top) {
         if (p->sst_change_lnum + buf->b_mod_xlines > buf->b_mod_top) {
           p->sst_change_lnum += buf->b_mod_xlines;
@@ -1638,8 +1635,8 @@ int get_syntax_attr(const colnr_T col, bool *const can_spell, const bool keep_st
   int attr = 0;
 
   if (can_spell != NULL) {
-    /* Default: Only do spelling when there is no @Spell cluster or when
+    // Default: Only do spelling when there is no @Spell cluster or when
-     * ":syn spell toplevel" was used. */
+    // ":syn spell toplevel" was used.
     *can_spell = syn_block->b_syn_spell == SYNSPL_DEFAULT
                  ? (syn_block->b_spell_cluster_id == 0)
                  : (syn_block->b_syn_spell == SYNSPL_TOP);
@@ -1901,15 +1898,15 @@ static int syn_current_attr(const bool syncing, const bool displaying, bool *con
               syn_add_start_off(&pos, &regmatch,
                                 spp, SPO_MS_OFF, -1);
               if (pos.lnum > current_lnum) {
-                /* must have used end of match in a next line,
+                // must have used end of match in a next line,
-                 * we can't handle that */
+                // we can't handle that
                 spp->sp_startcol = MAXCOL;
                 continue;
               }
               startcol = pos.col;
 
-              /* remember the next column where this pattern
+              // remember the next column where this pattern
-               * matches in the current line */
+              // matches in the current line
               spp->sp_startcol = startcol;
 
               /*
@@ -1999,8 +1996,8 @@ static int syn_current_attr(const bool syncing, const bool displaying, bool *con
               /*
                * keep the best match so far in next_match_*
                */
-              /* Highlighting must start after startpos and end
+              // Highlighting must start after startpos and end
-               * before endpos. */
+              // before endpos.
               if (hl_startpos.lnum == current_lnum
                   && (int)hl_startpos.col < startcol) {
                 hl_startpos.col = startcol;
@@ -2029,8 +2026,8 @@ static int syn_current_attr(const bool syncing, const bool displaying, bool *con
         if (next_match_idx >= 0 && next_match_col == (int)current_col) {
           synpat_T *lspp;
 
-          /* When a zero-width item matched which has a nextgroup,
+          // When a zero-width item matched which has a nextgroup,
-           * don't push the item but set nextgroup. */
+          // don't push the item but set nextgroup.
           lspp = &(SYN_ITEMS(syn_block)[next_match_idx]);
           if (next_match_m_endpos.lnum == current_lnum
               && next_match_m_endpos.col == current_col
@@ -2127,8 +2124,8 @@ static int syn_current_attr(const bool syncing, const bool displaying, bool *con
        * done in the current item.
        */
       if (syn_block->b_spell_cluster_id == 0) {
-        /* There is no @Spell cluster: Do spelling for items without
+        // There is no @Spell cluster: Do spelling for items without
-         * @NoSpell cluster. */
+        // @NoSpell cluster.
         if (syn_block->b_nospell_cluster_id == 0
             || current_trans_id == 0) {
           *can_spell = (syn_block->b_syn_spell != SYNSPL_NOTOP);
@@ -2180,8 +2177,8 @@ static int syn_current_attr(const bool syncing, const bool displaying, bool *con
       }
     }
   } else if (can_spell != NULL) {
-    /* Default: Only do spelling when there is no @Spell cluster or when
+    // Default: Only do spelling when there is no @Spell cluster or when
-     * ":syn spell toplevel" was used. */
+    // ":syn spell toplevel" was used.
     *can_spell = syn_block->b_syn_spell == SYNSPL_DEFAULT
                  ? (syn_block->b_spell_cluster_id == 0)
                  : (syn_block->b_syn_spell == SYNSPL_TOP);
@@ -2365,8 +2362,8 @@ static void check_state_ends(void)
           current_next_list = NULL;
         }
 
-        /* When the ended item has "extend", another item with
+        // When the ended item has "extend", another item with
-         * "keepend" now needs to check for its end. */
+        // "keepend" now needs to check for its end.
         had_extend = (cur_si->si_flags & HL_EXTEND);
 
         pop_current_state();
@@ -2541,9 +2538,9 @@ static void update_si_end(stateitem_T *sip, int startcol, bool force)
     return;
   }
 
-  /* Don't update when it's already done.  Can be a match of an end pattern
+  // Don't update when it's already done.  Can be a match of an end pattern
-   * that started in a previous line.  Watch out: can also be a "keepend"
+  // that started in a previous line.  Watch out: can also be a "keepend"
-   * from a containing item. */
+  // from a containing item.
   if (!force && sip->si_m_endpos.lnum >= current_lnum) {
     return;
   }
@@ -2822,8 +2819,8 @@ static void find_endpos(int idx, lpos_T *startpos, lpos_T *m_endpos, lpos_T *hl_
       }
       limit_pos(hl_endpos, m_endpos);
 
-      /* now the match ends where the highlighting ends, it is turned
+      // now the match ends where the highlighting ends, it is turned
-       * into the matchgroup for the end */
+      // into the matchgroup for the end
       *m_endpos = *hl_endpos;
     } else {
       *end_idx = 0;
@@ -5570,8 +5567,8 @@ static int in_id_list(stateitem_T *cur_si, int16_t *list, struct sp_syn *ssp, in
   // If ssp has a "containedin" list and "cur_si" is in it, return TRUE.
   if (cur_si != NULL && ssp->cont_in_list != NULL
       && !(cur_si->si_flags & HL_MATCH)) {
-    /* Ignore transparent items without a contains argument.  Double check
+    // Ignore transparent items without a contains argument.  Double check
-     * that we don't go back past the first one. */
+    // that we don't go back past the first one.
     while ((cur_si->si_flags & HL_TRANS_CONT)
            && cur_si > (stateitem_T *)(current_state.ga_data)) {
       --cur_si;
@@ -5635,8 +5632,8 @@ static int in_id_list(stateitem_T *cur_si, int16_t *list, struct sp_syn *ssp, in
     }
     if (item >= SYNID_CLUSTER) {
       scl_list = SYN_CLSTR(syn_block)[item - SYNID_CLUSTER].scl_list;
-      /* restrict recursiveness to 30 to avoid an endless loop for a
+      // restrict recursiveness to 30 to avoid an endless loop for a
-       * cluster that includes itself (indirectly) */
+      // cluster that includes itself (indirectly)
       if (scl_list != NULL && depth < 30) {
         ++depth;
         r = in_id_list(NULL, scl_list, ssp, contained);
@@ -5931,8 +5928,8 @@ int syn_get_sub_char(void)
 int syn_get_stack_item(int i)
 {
   if (i >= current_state.ga_len) {
-    /* Need to invalidate the state, because we didn't properly finish it
+    // Need to invalidate the state, because we didn't properly finish it
-     * for the last character, "keep_state" was TRUE. */
+    // for the last character, "keep_state" was TRUE.
     invalidate_current_state();
     current_col = MAXCOL;
     return -1;

src/nvim/tag.c

@@ -230,8 +230,8 @@ int do_tag(char_u *tag, int type, int count, int forceit, int verbose)
       if (g_do_tagpreview != 0) {
         if (ptag_entry.tagname != NULL
             && STRCMP(ptag_entry.tagname, tag) == 0) {
-          /* Jumping to same tag: keep the current match, so that
+          // Jumping to same tag: keep the current match, so that
-           * the CursorHold autocommand example works. */
+          // the CursorHold autocommand example works.
           cur_match = ptag_entry.cur_match;
           cur_fnum = ptag_entry.cur_fnum;
         } else {
@@ -407,9 +407,9 @@ int do_tag(char_u *tag, int type, int count, int forceit, int verbose)
         tagstack[tagstackidx].fmark.fnum = curbuf->b_fnum;
       }
 
-      /* Curwin will change in the call to jumpto_tag() if ":stag" was
+      // Curwin will change in the call to jumpto_tag() if ":stag" was
-       * used or an autocommand jumps to another window; store value of
+      // used or an autocommand jumps to another window; store value of
-       * tagstackidx now. */
+      // tagstackidx now.
       curwin->w_tagstackidx = tagstackidx;
       if (type != DT_SELECT && type != DT_JUMP) {
         curwin->w_tagstack[tagstackidx].cur_match = cur_match;
@@ -418,9 +418,9 @@ int do_tag(char_u *tag, int type, int count, int forceit, int verbose)
     }
   }
 
-  /* When not using the current buffer get the name of buffer "cur_fnum".
+  // When not using the current buffer get the name of buffer "cur_fnum".
-   * Makes sure that the tag order doesn't change when using a remembered
+  // Makes sure that the tag order doesn't change when using a remembered
-   * position for "cur_match". */
+  // position for "cur_match".
   if (cur_fnum != curbuf->b_fnum) {
     buf_T *buf = buflist_findnr(cur_fnum);
 
@@ -1101,8 +1101,8 @@ static void prepare_pats(pat_T *pats, int has_re)
   pats->head = pats->pat;
   pats->headlen = pats->len;
   if (has_re) {
-    /* When the pattern starts with '^' or "\\<", binary searching can be
+    // When the pattern starts with '^' or "\\<", binary searching can be
-     * used (much faster). */
+    // used (much faster).
     if (pats->pat[0] == '^') {
       pats->head = pats->pat + 1;
     } else if (pats->pat[0] == '\\' && pats->pat[1] == '<') {
@@ -1500,8 +1500,8 @@ int find_tags(char_u *pat, int *num_matches, char_u ***matchesp, int flags, int
 
   orgpat.len = (int)STRLEN(pat);
   if (curbuf->b_help) {
-    /* When "@ab" is specified use only the "ab" language, otherwise
+    // When "@ab" is specified use only the "ab" language, otherwise
-     * search all languages. */
+    // search all languages.
     if (orgpat.len > 3 && pat[orgpat.len - 3] == '@'
         && ASCII_ISALPHA(pat[orgpat.len - 2])
         && ASCII_ISALPHA(pat[orgpat.len - 1])) {
@@ -1613,9 +1613,9 @@ int find_tags(char_u *pat, int *num_matches, char_u ***matchesp, int flags, int
               }
             }
             if (s == NULL || *s == NUL) {
-              /* Language not in 'helplang': use last, prefer English,
+              // Language not in 'helplang': use last, prefer English,
-               * unless found already. */
+              // unless found already.
-              ++help_pri;
+              help_pri++;
               if (STRICMP(help_lang, "en") != 0) {
                 ++help_pri;
               }
@@ -1654,8 +1654,8 @@ int find_tags(char_u *pat, int *num_matches, char_u ***matchesp, int flags, int
           stop_searching = true;
           break;
         }
-        /* When mincount is TAG_MANY, stop when enough matches have been
+        // When mincount is TAG_MANY, stop when enough matches have been
-         * found (for completion). */
+        // found (for completion).
         if (mincount == TAG_MANY && match_count >= TAG_MANY) {
           stop_searching = true;
           retval = OK;
@@ -1695,8 +1695,8 @@ int find_tags(char_u *pat, int *num_matches, char_u ***matchesp, int flags, int
           vim_fseek(fp, search_info.curr_offset, SEEK_SET);
           eof = vim_fgets(lbuf, lbuf_size, fp);
           if (!eof && search_info.curr_offset != 0) {
-            /* The explicit cast is to work around a bug in gcc 3.4.2
+            // The explicit cast is to work around a bug in gcc 3.4.2
-             * (repeated below). */
+            // (repeated below).
             search_info.curr_offset = vim_ftell(fp);
             if (search_info.curr_offset == search_info.high_offset) {
               // oops, gone a bit too far; try from low offset
@@ -1739,9 +1739,9 @@ line_read_in:
           char_u *conv_line;
           int len;
 
-          /* Convert every line.  Converting the pattern from 'enc' to
+          // Convert every line.  Converting the pattern from 'enc' to
-           * the tags file encoding doesn't work, because characters are
+          // the tags file encoding doesn't work, because characters are
-           * not recognized. */
+          // not recognized.
           conv_line = string_convert(&vimconv, lbuf, NULL);
           if (conv_line != NULL) {
             // Copy or swap lbuf and conv_line.
@@ -1764,13 +1764,12 @@ line_read_in:
          * format, and for "not sorted" flag.
          */
         if (state == TS_START) {
-          /* The header ends when the line sorts below "!_TAG_".  When
+          // The header ends when the line sorts below "!_TAG_".  When
-           * case is folded lower case letters sort before "_". */
+          // case is folded lower case letters sort before "_".
           if (STRNCMP(lbuf, "!_TAG_", 6) <= 0
               || (lbuf[0] == '!' && ASCII_ISLOWER(lbuf[1]))) {
             if (STRNCMP(lbuf, "!_TAG_", 6) != 0) {
-              /* Non-header item before the header, e.g. "!" itself.
+              // Non-header item before the header, e.g. "!" itself.
-               */
               goto parse_line;
             }
 
@@ -1781,10 +1780,9 @@ line_read_in:
               tag_file_sorted = lbuf[18];
             }
             if (STRNCMP(lbuf, "!_TAG_FILE_ENCODING\t", 20) == 0) {
-              /* Prepare to convert every line from the specified
+              // Prepare to convert every line from the specified
-               * encoding to 'encoding'. */
+              // encoding to 'encoding'.
-              for (p = lbuf + 20; *p > ' ' && *p < 127; ++p) {
+              for (p = lbuf + 20; *p > ' ' && *p < 127; p++) {
-                ;
               }
               *p = NUL;
               convert_setup(&vimconv, lbuf + 20, p_enc);
@@ -1820,9 +1818,9 @@ line_read_in:
           }
 
           if (state == TS_BINARY && orgpat.regmatch.rm_ic && !sortic) {
-            /* Binary search won't work for ignoring case, use linear
+            // Binary search won't work for ignoring case, use linear
-             * search. */
+            // search.
-            linear = TRUE;
+            linear = true;
             state = TS_LINEAR;
           }
 
@@ -1927,9 +1925,8 @@ parse_line:
             }
 
             if (tagcmp == 0) {
-              /* We've located the tag, now skip back and search
+              // We've located the tag, now skip back and search
-               * forward until the first matching tag is found.
+              // forward until the first matching tag is found.
-               */
               state = TS_SKIP_BACK;
               search_info.match_offset = search_info.curr_offset;
               continue;
@@ -1966,8 +1963,8 @@ parse_line:
             if (mb_strnicmp(tagp.tagname, orgpat.head, (size_t)cmplen) != 0) {
               state = TS_STEP_FORWARD;
             } else {
-              /* Have to skip back more.  Restore the curr_offset
+              // Have to skip back more.  Restore the curr_offset
-               * used, otherwise we get stuck at a long line. */
+              // used, otherwise we get stuck at a long line.
               search_info.curr_offset = search_info.curr_offset_used;
             }
             continue;

src/nvim/undo.c

@@ -69,8 +69,8 @@
  * All data is allocated and will all be freed when the buffer is unloaded.
  */
 
-/* Uncomment the next line for including the u_check() function.  This warns
+// Uncomment the next line for including the u_check() function.  This warns
- * for errors in the debug information. */
+// for errors in the debug information.
 // #define U_DEBUG 1
 #define UH_MAGIC 0x18dade       // value for uh_magic when in use
 #define UE_MAGIC 0xabc123       // value for ue_magic when in use
@@ -291,8 +291,8 @@ bool undo_allowed(buf_T *buf)
     return false;
   }
 
-  /* Don't allow changes in the buffer while editing the cmdline.  The
+  // Don't allow changes in the buffer while editing the cmdline.  The
-   * caller of getcmdline() may get confused. */
+  // caller of getcmdline() may get confused.
   if (textlock != 0) {
     EMSG(_(e_secure));
     return false;
@@ -1921,8 +1921,8 @@ static void u_doit(int startcount, bool quiet, bool do_buf_event)
 
       u_undoredo(false, do_buf_event);
 
-      /* Advance for next redo.  Set "newhead" when at the end of the
+      // Advance for next redo.  Set "newhead" when at the end of the
-       * redoable changes. */
+      // redoable changes.
       if (curbuf->b_u_curhead->uh_prev.ptr == NULL) {
         curbuf->b_u_newhead = curbuf->b_u_curhead;
       }
@@ -1967,8 +1967,8 @@ void undo_time(long step, bool sec, bool file, bool absolute)
     u_oldcount = -1;
   }
 
-  /* "target" is the node below which we want to be.
+  // "target" is the node below which we want to be.
-   * Init "closest" to a value we can't reach. */
+  // Init "closest" to a value we can't reach.
   if (absolute) {
     target = step;
     closest = -1;
@@ -1977,9 +1977,9 @@ void undo_time(long step, bool sec, bool file, bool absolute)
       target = (long)(curbuf->b_u_time_cur) + step;
     } else if (dofile) {
       if (step < 0) {
-        /* Going back to a previous write. If there were changes after
+        // Going back to a previous write. If there were changes after
-         * the last write, count that as moving one file-write, so
+        // the last write, count that as moving one file-write, so
-         * that ":earlier 1f" undoes all changes since the last save. */
+        // that ":earlier 1f" undoes all changes since the last save.
         uhp = curbuf->b_u_curhead;
         if (uhp != NULL) {
           uhp = uhp->uh_next.ptr;
@@ -2003,8 +2003,8 @@ void undo_time(long step, bool sec, bool file, bool absolute)
         // Moving forward to a newer write.
         target = curbuf->b_u_save_nr_cur + step;
         if (target > curbuf->b_u_save_nr_last) {
-          /* Go to after last write: after the latest change. Use
+          // Go to after last write: after the latest change. Use
-           * the sequence number for that. */
+          // the sequence number for that.
           target = curbuf->b_u_seq_last + 1;
           dofile = false;
         }
@@ -2072,10 +2072,10 @@ void undo_time(long step, bool sec, bool file, bool absolute)
       }
 
       if (round == 1 && !(dofile && val == 0)) {
-        /* Remember the header that is closest to the target.
+        // Remember the header that is closest to the target.
-         * It must be at least in the right direction (checked with
+        // It must be at least in the right direction (checked with
-         * "b_u_seq_cur").  When the timestamp is equal find the
+        // "b_u_seq_cur").  When the timestamp is equal find the
-         * highest/lowest sequence number. */
+        // highest/lowest sequence number.
         if ((step < 0 ? uhp->uh_seq <= curbuf->b_u_seq_cur
                       : uhp->uh_seq > curbuf->b_u_seq_cur)
             && ((dosec && val == closest)
@@ -2095,8 +2095,8 @@ void undo_time(long step, bool sec, bool file, bool absolute)
         }
       }
 
-      /* Quit searching when we found a match.  But when searching for a
+      // Quit searching when we found a match.  But when searching for a
-       * time we need to continue looking for the best uh_seq. */
+      // time we need to continue looking for the best uh_seq.
       if (target == val && !dosec) {
         target = uhp->uh_seq;
         break;
@@ -2112,10 +2112,9 @@ void undo_time(long step, bool sec, bool file, bool absolute)
                && uhp->uh_alt_next.ptr->uh_walk != nomark
                && uhp->uh_alt_next.ptr->uh_walk != mark) {
         uhp = uhp->uh_alt_next.ptr;
-      }
+      } else if (uhp->uh_next.ptr != NULL && uhp->uh_alt_prev.ptr == NULL
-      /* go up in the tree if we haven't been there and we are at the
+                 // go up in the tree if we haven't been there and we are at the
-       * start of alternate branches */
+                 // start of alternate branches
-      else if (uhp->uh_next.ptr != NULL && uhp->uh_alt_prev.ptr == NULL
                  && uhp->uh_next.ptr->uh_walk != nomark
                  && uhp->uh_next.ptr->uh_walk != mark) {
         // If still at the start we don't go through this change.
@@ -2297,8 +2296,8 @@ static void u_undoredo(int undo, bool do_buf_event)
   bool empty_buffer;                        // buffer became empty
   u_header_T *curhead = curbuf->b_u_curhead;
 
-  /* Don't want autocommands using the undo structures here, they are
+  // Don't want autocommands using the undo structures here, they are
-   * invalid till the end. */
+  // invalid till the end.
   block_autocmds();
 
 #ifdef U_DEBUG
@@ -2549,8 +2548,8 @@ static void u_undoredo(int undo, bool do_buf_event)
     }
   }
 
-  /* The timestamp can be the same for multiple changes, just use the one of
+  // The timestamp can be the same for multiple changes, just use the one of
-   * the undone/redone change. */
+  // the undone/redone change.
   curbuf->b_u_time_cur = curhead->uh_time;
 
   unblock_autocmds();
@@ -2709,10 +2708,9 @@ void ex_undolist(exarg_T *eap)
              && uhp->uh_alt_next.ptr->uh_walk != nomark
              && uhp->uh_alt_next.ptr->uh_walk != mark) {
       uhp = uhp->uh_alt_next.ptr;
-    }
+    } else if (uhp->uh_next.ptr != NULL && uhp->uh_alt_prev.ptr == NULL
-    /* go up in the tree if we haven't been there and we are at the
+               // go up in the tree if we haven't been there and we are at the
-     * start of alternate branches */
+               // start of alternate branches
-    else if (uhp->uh_next.ptr != NULL && uhp->uh_alt_prev.ptr == NULL
                && uhp->uh_next.ptr->uh_walk != nomark
                && uhp->uh_next.ptr->uh_walk != mark) {
       uhp = uhp->uh_next.ptr;
@@ -2906,8 +2904,8 @@ static void u_freeheader(buf_T *buf, u_header_T *uhp, u_header_T **uhpp)
 {
   u_header_T *uhap;
 
-  /* When there is an alternate redo list free that branch completely,
+  // When there is an alternate redo list free that branch completely,
-   * because we can never go there. */
+  // because we can never go there.
   if (uhp->uh_alt_next.ptr != NULL) {
     u_freebranch(buf, uhp->uh_alt_next.ptr, uhpp);
   }
@@ -2942,8 +2940,8 @@ static void u_freebranch(buf_T *buf, u_header_T *uhp, u_header_T **uhpp)
 {
   u_header_T *tofree, *next;
 
-  /* If this is the top branch we may need to use u_freeheader() to update
+  // If this is the top branch we may need to use u_freeheader() to update
-   * all the pointers. */
+  // all the pointers.
   if (uhp == buf->b_u_oldhead) {
     while (buf->b_u_oldhead != NULL) {
       u_freeheader(buf, buf->b_u_oldhead, uhpp);

src/nvim/window.c

@@ -298,8 +298,8 @@ newwindow:
       tabpage_T *oldtab = curtab;
       tabpage_T *newtab;
 
-      /* First create a new tab with the window, then go back to
+      // First create a new tab with the window, then go back to
-       * the old tab and close the window there. */
+      // the old tab and close the window there.
       wp = curwin;
       if (win_new_tabpage((int)Prenum, NULL) == OK
           && valid_tabpage(oldtab)) {
@@ -519,8 +519,8 @@ wingotofile:
         postponed_split = -1;
       }
 
-      /* Execute the command right here, required when
+      // Execute the command right here, required when
-       * "wincmd g}" was used in a function. */
+      // "wincmd g}" was used in a function.
       do_nv_ident('g', xchar);
       break;
 
@@ -922,8 +922,8 @@ int win_split(int size, int flags)
     return FAIL;
   }
 
-  /* When creating the help window make a snapshot of the window layout.
+  // When creating the help window make a snapshot of the window layout.
-   * Otherwise clear the snapshot, it's now invalid. */
+  // Otherwise clear the snapshot, it's now invalid.
   if (flags & WSP_HELP) {
     make_snapshot(SNAP_HELP_IDX);
   } else {
@@ -1260,8 +1260,8 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
     frame_append(curfrp, frp);
   }
 
-  /* Set w_fraction now so that the cursor keeps the same relative
+  // Set w_fraction now so that the cursor keeps the same relative
-   * vertical position. */
+  // vertical position.
   if (!did_set_fraction) {
     set_fraction(oldwin);
   }
@@ -1287,8 +1287,8 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
     }
     frp->fr_height = curfrp->fr_height;
 
-    /* "new_size" of the current window goes to the new window, use
+    // "new_size" of the current window goes to the new window, use
-     * one column for the vertical separator */
+    // one column for the vertical separator
     win_new_width(wp, new_size);
     if (before) {
       wp->w_vsep_width = 1;
@@ -1328,8 +1328,8 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
     }
     frp->fr_width = curfrp->fr_width;
 
-    /* "new_size" of the current window goes to the new window, use
+    // "new_size" of the current window goes to the new window, use
-     * one row for the status line */
+    // one row for the status line
     win_new_height(wp, new_size);
     if (flags & (WSP_TOP | WSP_BOT)) {
       int new_fr_height = curfrp->fr_height - new_size;
@@ -1388,8 +1388,8 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
               'v');
   }
 
-  /* Don't change the window height/width to 'winheight' / 'winwidth' if a
+  // Don't change the window height/width to 'winheight' / 'winwidth' if a
-   * size was given. */
+  // size was given.
   if (flags & WSP_VERT) {
     i = p_wiw;
     if (size != 0) {
@@ -1589,8 +1589,8 @@ int make_windows(int count, bool vertical)
   int todo;
 
   if (vertical) {
-    /* Each windows needs at least 'winminwidth' lines and a separator
+    // Each windows needs at least 'winminwidth' lines and a separator
-     * column. */
+    // column.
     maxcount = (curwin->w_width + curwin->w_vsep_width
                 - (p_wiw - p_wmw)) / (p_wmw + 1);
   } else {
@@ -1679,8 +1679,8 @@ static void win_exchange(long Prenum)
     frp = curwin->w_frame->fr_prev;
   }
 
-  /* We can only exchange a window with another window, not with a frame
+  // We can only exchange a window with another window, not with a frame
-   * containing windows. */
+  // containing windows.
   if (frp == NULL || frp->fr_win == NULL || frp->fr_win == curwin) {
     return;
   }
@@ -1890,8 +1890,8 @@ void win_move_after(win_T *win1, win_T *win2)
       win1->w_status_height = win2->w_status_height;
       win2->w_status_height = height;
       if (win1->w_vsep_width == 1) {
-        /* Remove the vertical separator from win1, add it to the last
+        // Remove the vertical separator from win1, add it to the last
-         * window, win2.  Adjust the frame widths. */
+        // window, win2.  Adjust the frame widths.
         win2->w_vsep_width = 1;
         win2->w_frame->fr_width += 1;
         win1->w_vsep_width = 0;
@@ -1955,8 +1955,8 @@ static void win_equal_rec(win_T *next_curwin, bool current, frame_T *topfr, int
   bool hnc;
 
   if (topfr->fr_layout == FR_LEAF) {
-    /* Set the width/height of this frame.
+    // Set the width/height of this frame.
-     * Redraw when size or position changes */
+    // Redraw when size or position changes
     if (topfr->fr_height != height || topfr->fr_win->w_winrow != row
         || topfr->fr_width != width ||
         topfr->fr_win->w_wincol != col) {
@@ -2028,8 +2028,8 @@ static void win_equal_rec(win_T *next_curwin, bool current, frame_T *topfr, int
           } else if (totwincount > 1
                      && (room + (totwincount - 2))
                      / (totwincount - 1) > p_wiw) {
-            /* Can make all windows wider than 'winwidth', spread
+            // Can make all windows wider than 'winwidth', spread
-             * the room equally. */
+            // the room equally.
             next_curwin_size = (room + p_wiw
                                 + (totwincount - 1) * p_wmw
                                 + (totwincount - 1)) / totwincount;
@@ -2084,8 +2084,8 @@ static void win_equal_rec(win_T *next_curwin, bool current, frame_T *topfr, int
         new_size += n;
       }
 
-      /* Skip frame that is full width when splitting or closing a
+      // Skip frame that is full width when splitting or closing a
-       * window, unless equalizing all frames. */
+      // window, unless equalizing all frames.
       if (!current || dir != 'v' || topfr->fr_parent != NULL
           || (new_size != fr->fr_width)
           || frame_has_win(fr, next_curwin)) {
@@ -2120,8 +2120,8 @@ static void win_equal_rec(win_T *next_curwin, bool current, frame_T *topfr, int
       m = frame_minheight(topfr, next_curwin);
       room = height - m;
       if (room < 0) {
-        /* The room is less then 'winheight', use all space for the
+        // The room is less then 'winheight', use all space for the
-         * current window. */
+        // current window.
         next_curwin_size = p_wh + room;
         room = 0;
       } else {
@@ -2159,8 +2159,8 @@ static void win_equal_rec(win_T *next_curwin, bool current, frame_T *topfr, int
           } else if (totwincount > 1
                      && (room + (totwincount - 2))
                      / (totwincount - 1) > p_wh) {
-            /* can make all windows higher than 'winheight',
+            // can make all windows higher than 'winheight',
-             * spread the room equally. */
+            // spread the room equally.
             next_curwin_size = (room + p_wh
                                 + (totwincount - 1) * p_wmh
                                 + (totwincount - 1)) / totwincount;
@@ -2214,8 +2214,8 @@ static void win_equal_rec(win_T *next_curwin, bool current, frame_T *topfr, int
         }
         new_size += n;
       }
-      /* Skip frame that is full width when splitting or closing a
+      // Skip frame that is full width when splitting or closing a
-       * window, unless equalizing all frames. */
+      // window, unless equalizing all frames.
       if (!current || dir != 'h' || topfr->fr_parent != NULL
           || (new_size != fr->fr_height)
           || frame_has_win(fr, next_curwin)) {
@@ -2263,8 +2263,8 @@ void close_windows(buf_T *buf, int keep_curwin)
             && !(wp->w_closing || wp->w_buffer->b_locked > 0)) {
           win_close_othertab(wp, false, tp);
 
-          /* Start all over, the tab page may be closed and
+          // Start all over, the tab page may be closed and
-           * autocommands may change the window layout. */
+          // autocommands may change the window layout.
           nexttp = first_tabpage;
           break;
         }
@@ -2630,8 +2630,8 @@ int win_close(win_T *win, bool free_buf)
    */
   last_status(false);
 
-  /* After closing the help window, try restoring the window layout from
+  // After closing the help window, try restoring the window layout from
-   * before it was opened. */
+  // before it was opened.
   if (help_window) {
     restore_snapshot(SNAP_HELP_IDX, close_curwin);
   }
@@ -2703,8 +2703,8 @@ void win_close_othertab(win_T *win, int free_buf, tabpage_T *tp)
     close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0, false);
   }
 
-  /* Careful: Autocommands may have closed the tab page or made it the
+  // Careful: Autocommands may have closed the tab page or made it the
-   * current tab page.  */
+  // current tab page.
   for (ptp = first_tabpage; ptp != NULL && ptp != tp; ptp = ptp->tp_next) {
     ;
   }
@@ -2863,9 +2863,9 @@ win_T *winframe_remove(win_T *win, int *dirp, tabpage_T *tp)
   frame_remove(frp_close);
 
   if (frp_close->fr_parent->fr_layout == FR_COL) {
-    /* When 'winfixheight' is set, try to find another frame in the column
+    // When 'winfixheight' is set, try to find another frame in the column
-     * (as close to the closed frame as possible) to distribute the height
+    // (as close to the closed frame as possible) to distribute the height
-     * to. */
+    // to.
     if (frp2->fr_win != NULL && frp2->fr_win->w_p_wfh) {
       frp = frp_close->fr_prev;
       frp3 = frp_close->fr_next;
@@ -2922,8 +2922,8 @@ win_T *winframe_remove(win_T *win, int *dirp, tabpage_T *tp)
     *dirp = 'h';
   }
 
-  /* If rows/columns go to a window below/right its positions need to be
+  // If rows/columns go to a window below/right its positions need to be
-   * updated.  Can only be done after the sizes have been updated. */
+  // updated.  Can only be done after the sizes have been updated.
   if (frp2 == frp_close->fr_next) {
     int row = win->w_winrow;
     int col = win->w_wincol;
@@ -2932,8 +2932,8 @@ win_T *winframe_remove(win_T *win, int *dirp, tabpage_T *tp)
   }
 
   if (frp2->fr_next == NULL && frp2->fr_prev == NULL) {
-    /* There is no other frame in this list, move its info to the parent
+    // There is no other frame in this list, move its info to the parent
-     * and remove it. */
+    // and remove it.
     frp2->fr_parent->fr_layout = frp2->fr_layout;
     frp2->fr_parent->fr_child = frp2->fr_child;
     FOR_ALL_FRAMES(frp, frp2->fr_child) {
@@ -2951,8 +2951,8 @@ win_T *winframe_remove(win_T *win, int *dirp, tabpage_T *tp)
 
     frp2 = frp->fr_parent;
     if (frp2 != NULL && frp2->fr_layout == frp->fr_layout) {
-      /* The frame above the parent has the same layout, have to merge
+      // The frame above the parent has the same layout, have to merge
-       * the frames into this list. */
+      // the frames into this list.
       if (frp2->fr_child == frp) {
         frp2->fr_child = frp->fr_child;
       }
@@ -3641,8 +3641,8 @@ static int win_alloc_firstwin(win_T *oldwin)
 {
   curwin = win_alloc(NULL, false);
   if (oldwin == NULL) {
-    /* Very first window, need to create an empty buffer for it and
+    // Very first window, need to create an empty buffer for it and
-     * initialize from scratch. */
+    // initialize from scratch.
     curbuf = buflist_new(NULL, NULL, 1L, BLN_LISTED);
     if (curbuf == NULL) {
       return FAIL;
@@ -4014,10 +4014,10 @@ static void enter_tabpage(tabpage_T *tp, buf_T *old_curbuf, bool trigger_enter_a
   const int row = win_comp_pos();  // recompute w_winrow for all windows
   diff_need_scrollbind = true;
 
-  /* The tabpage line may have appeared or disappeared, may need to resize
+  // The tabpage line may have appeared or disappeared, may need to resize
-   * the frames for that.  When the Vim window was resized need to update
+  // the frames for that.  When the Vim window was resized need to update
-   * frame sizes too.  Use the stored value of p_ch, so that it can be
+  // frame sizes too.  Use the stored value of p_ch, so that it can be
-   * different for each tab page. */
+  // different for each tab page.
   if (p_ch != curtab->tp_ch_used) {
     clear_cmdline = true;
   }
@@ -4112,8 +4112,8 @@ void goto_tabpage(int n)
       tp = curtab->tp_next;
     }
   } else if (n < 0) {
-    /* "gT": go to previous tab page, wrap around end.  "N gT" repeats
+    // "gT": go to previous tab page, wrap around end.  "N gT" repeats
-     * this N times. */
+    // this N times.
     ttp = curtab;
     for (i = n; i < 0; ++i) {
       for (tp = first_tabpage; tp->tp_next != ttp && tp->tp_next != NULL;
@@ -4677,9 +4677,9 @@ static win_T *win_alloc(win_T *after, bool hidden)
   new_wp->w_vars = tv_dict_alloc();
   init_var_dict(new_wp->w_vars, &new_wp->w_winvar, VAR_SCOPE);
 
-  /* Don't execute autocommands while the window is not properly
+  // Don't execute autocommands while the window is not properly
-   * initialized yet.  gui_create_scrollbar() may trigger a FocusGained
+  // initialized yet.  gui_create_scrollbar() may trigger a FocusGained
-   * event. */
+  // event.
   block_autocmds();
   /*
    * link the window in the window list
@@ -4742,8 +4742,8 @@ static void win_free(win_T *wp, tabpage_T *tp)
   // reduce the reference count to the argument list.
   alist_unlink(wp->w_alist);
 
-  /* Don't execute autocommands while the window is halfway being deleted.
+  // Don't execute autocommands while the window is halfway being deleted.
-   * gui_mch_destroy_scrollbar() may trigger a FocusGained event. */
+  // gui_mch_destroy_scrollbar() may trigger a FocusGained event.
   block_autocmds();
 
   clear_winopt(&wp->w_onebuf_opt);
@@ -5200,8 +5200,8 @@ static void frame_setheight(frame_T *curfrp, int height)
       frame_new_height(curfrp, height, false, false);
     }
   } else if (curfrp->fr_parent->fr_layout == FR_ROW) {
-    /* Row of frames: Also need to resize frames left and right of this
+    // Row of frames: Also need to resize frames left and right of this
-     * one.  First check for the minimal height of these. */
+    // one.  First check for the minimal height of these.
     h = frame_minheight(curfrp->fr_parent, NULL);
     if (height < h) {
       height = h;
@@ -5261,13 +5261,13 @@ static void frame_setheight(frame_T *curfrp, int height)
      */
     take = height - curfrp->fr_height;
 
-    /* If there is not enough room, also reduce the height of a window
+    // If there is not enough room, also reduce the height of a window
-     * with 'winfixheight' set. */
+    // with 'winfixheight' set.
     if (height > room + room_cmdline - room_reserved) {
       room_reserved = room + room_cmdline - height;
     }
-    /* If there is only a 'winfixheight' window and making the
+    // If there is only a 'winfixheight' window and making the
-    * window smaller, need to make the other window taller. */
+    // window smaller, need to make the other window taller.
     if (take < 0 && room - curfrp->fr_height < room_reserved) {
       room_reserved = 0;
     }
@@ -5342,8 +5342,8 @@ void win_setwidth(int width)
 
 void win_setwidth_win(int width, win_T *wp)
 {
-  /* Always keep current window at least one column wide, even when
+  // Always keep current window at least one column wide, even when
-   * 'winminwidth' is zero. */
+  // 'winminwidth' is zero.
   if (wp == curwin) {
     if (width < p_wmw) {
       width = p_wmw;
@@ -5394,8 +5394,8 @@ static void frame_setwidth(frame_T *curfrp, int width)
   }
 
   if (curfrp->fr_parent->fr_layout == FR_COL) {
-    /* Column of frames: Also need to resize frames above and below of
+    // Column of frames: Also need to resize frames above and below of
-     * this one.  First check for the minimal width of these. */
+    // this one.  First check for the minimal width of these.
     w = frame_minwidth(curfrp->fr_parent, NULL);
     if (width < w) {
       width = w;
@@ -5442,13 +5442,13 @@ static void frame_setwidth(frame_T *curfrp, int width)
      */
     take = width - curfrp->fr_width;
 
-    /* If there is not enough room, also reduce the width of a window
+    // If there is not enough room, also reduce the width of a window
-     * with 'winfixwidth' set. */
+    // with 'winfixwidth' set.
     if (width > room - room_reserved) {
       room_reserved = room - width;
     }
-    /* If there is only a 'winfixwidth' window and making the
+    // If there is only a 'winfixwidth' window and making the
-     * window smaller, need to make the other window narrower. */
+    // window smaller, need to make the other window narrower.
     if (take < 0 && room - curfrp->fr_width < room_reserved) {
       room_reserved = 0;
     }
@@ -5557,8 +5557,8 @@ void win_drag_status_line(win_T *dragwin, int offset)
   curfr = fr;
   if (fr != topframe) {         // more than one window
     fr = fr->fr_parent;
-    /* When the parent frame is not a column of frames, its parent should
+    // When the parent frame is not a column of frames, its parent should
-     * be. */
+    // be.
     if (fr->fr_layout != FR_COL) {
       curfr = fr;
       if (fr != topframe) {     // only a row of windows, may drag statusline
@@ -6009,9 +6009,9 @@ void command_height(void)
   frame_T *frp;
   int old_p_ch = curtab->tp_ch_used;
 
-  /* Use the value of p_ch that we remembered.  This is needed for when the
+  // Use the value of p_ch that we remembered.  This is needed for when the
-   * GUI starts up, we can't be sure in what order things happen.  And when
+  // GUI starts up, we can't be sure in what order things happen.  And when
-   * p_ch was changed in another tab page. */
+  // p_ch was changed in another tab page.
   curtab->tp_ch_used = p_ch;
 
   // Find bottom frame with width of screen.
@@ -6270,8 +6270,8 @@ static void last_status_rec(frame_T *fr, bool statusline)
           EMSG(_(e_noroom));
           return;
         }
-        /* In a column of frames: go to frame above.  If already at
+        // In a column of frames: go to frame above.  If already at
-         * the top or in a row of frames: go to parent. */
+        // the top or in a row of frames: go to parent.
         if (fp->fr_parent->fr_layout == FR_COL && fp->fr_prev != NULL) {
           fp = fp->fr_prev;
         } else {