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

25 files changed, 823 insertions, 843 deletions

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 37cc854959..1de54e0736 100644
--- a/src/nvim/buffer.c
+++ b/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
-   * unloaded. */
+  // Return when a window is displaying the buffer or when it's not
+  // 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
-   * and possibly cursor col. */
+  // If autocommands did not change the cursor position, restore cursor lnum
+  // 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
-     * change curbuf!  If that happens, allocate a new buffer anyway. */
+    // It's like this buffer is deleted.  Watch out for autocommands that
+    // 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
-       * a listed buffer. */
+      // Only search for unlisted buffers if there was no match with
+      // 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
-     * files on Win32. */
+    // Allocate ffname and expand into full path.  Also resolves .lnk
+    // 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.
-     * First call msg_start() to get the message in the right place. */
+    // Temporarily set msg_scroll to avoid the message being truncated.
+    // 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
-   * triggers an autocommand, which reloads modelines with a ":do". */
+  // Disallow recursive entry here.  Can happen when executing a modeline
+  // triggers an autocommand, which reloads modelines with a ":do".
   if (entered) {
     return;
   }
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c
index 657777d7db..7958ff6e13 100644
--- a/src/nvim/eval/userfunc.c
+++ b/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
-   * command). */
+  // Check for hard coded <SNR>: already translated function ID (from a user
+  // 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
-   * braces should not cause the function not to be defined. */
+  // An error in a function call during evaluation of an expression in magic
+  // 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
-     * (that we are overwriting). */
+    // Check the name of the function.  Unless it's a dictionary function
+    // (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.
-   * Makes 'exe "func Test()\n...\nendfunc"' work. */
+  // When there is a line break use what follows for the function body.
+  // 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
-     * 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. */
+    // 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
+    // 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
-       * at "end". */
+      // Increase indent inside "if", "while", "for" and "try", decrease
+      // 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
-   * detected. */
+  // Don't define the function when skipping commands or when an error was
+  // 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
-   * "funcname(...", not "funcname!...". */
+  // Only accept "funcname", "funcname ", "funcname (..." and
+  // "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
-   * in this line (!returning).  Otherwise, ignore the rest of the line.
-   * Following lines will be ignored by get_func_line(). */
+  // When skipping or the return gets pending, advance to the next command
+  // in this line (!returning).  Otherwise, ignore the rest of the 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"
-         * without argument in a finally clause; reset the default
-         * return value. */
+        // The pending return value could be overwritten by a ":return"
+        // without argument in a finally clause; reset the default
+        // 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
-     * a return immediately after reanimation, the value is already
-     * there. */
+    // If the return is carried out now, store the return value.  For
+    // a return immediately after reanimation, the value is already
+    // there.
     if (!reanimate && rettv != NULL) {
       tv_clear(current_funccal->rettv);
       *current_funccal->rettv = *(typval_T *)rettv;
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 5d43a14168..4a23f284cc 100644
--- a/src/nvim/ex_cmds.c
+++ b/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
- * contain the longest line being sorted. */
+// Buffer for two lines used during sorting.  They are allocated to
+// 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 we return 0 every time, qsort will assume it's done sorting and
-   * exit. */
+  // 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
+  // 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 name", etc. */
+  // ":0file" removes the file name.  Check for illegal uses ":3file",
+  // "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
-       * buffer.  This makes it look like we are now editing the buffer
-       * under the new name.  Must be done before buf_write(), because
-       * if there is no file name and 'cpo' contains 'F', it will set
-       * the file name. */
+      // Exchange the file names for the current and the alternate
+      // buffer.  This makes it look like we are now editing the buffer
+      // under the new name.  Must be done before buf_write(), because
+      // if there is no file name and 'cpo' contains 'F', it will set
+      // 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
-       * 'autochdir' is set. */
+      // Autocommands may have changed buffer names, esp. when
+      // '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
-       * it's writable.  If the "." directory is not writable the write
-       * will probably fail anyway.
-       * Use 'shortname' of the current buffer, since there is no buffer
-       * for the written file. */
+      // We only try the first entry in 'directory', without checking if
+      // it's writable.  If the "." directory is not writable the write
+      // will probably fail anyway.
+      // Use 'shortname' of the current buffer, since there is no buffer
+      // 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
-     * for explicitly */
+    // May jump to last used line number for a loaded buffer or when asked
+    // 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
-         * was in this window (or another window).  If not used
-         * before, reset the local window options to the global
-         * values.  Also restores old folding stuff. */
+        // May get the window options from the last time this buffer
+        // was in this window (or another window).  If not used
+        // before, reset the local window options to the global
+        // 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
-   * unset.  Helps for when an autocommand changes files and expects syntax
-   * highlighting to work in the other file. */
-  did_filetype = FALSE;
+  // Since we are starting to edit a file, consider the filetype to be
+  // unset.  Helps for when an autocommand changes files and expects syntax
+  // highlighting to work in the other file.
+  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
-     * message. */
+    // Obey the 'O' flag in 'cpoptions': overwrite any previous file
+    // 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
-       * when there is no more. */
+      // No getline() function, use the lines that follow. This ends
+      // 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
-         * cursor position (just like Vi). */
+        // Save the line number of the last change for the final
+        // 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
-         * previous match. */
+        // Normally we continue searching for a match just after the
+        // 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
-           * asking for confirmation. */
+          // When 'cpoptions' contains "u" don't sync undo when
+          // 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
-             * the end of the line and set nmatch to one, so that
-             * we continue looking for a match on the next line.
-             * Avoids that ":%s/\nB\@=//gc" and ":%s/\n/,\r/gc"
-             * get stuck when pressing 'n'. */
+            // For a multi-line match, put matchcol at the NUL at
+            // the end of the line and set nmatch to one, so that
+            // we continue looking for a match on the next line.
+            // Avoids that ":%s/\nB\@=//gc" and ":%s/\n/,\r/gc"
+            // 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
-         * use "\=col("."). */
+        // Move the cursor to the start of the match, so that we can
+        // 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
-         * the end of the line, except that a pattern like
-         * "bar\|\nfoo" may match at the NUL.  "lnum" can be below
-         * "line2" when there is a \zs in the pattern after a line
-         * break. */
+        // We already know that we did the last subst when we are at
+        // the end of the line, except that a pattern like
+        // "bar\|\nfoo" may match at the NUL.  "lnum" can be below
+        // "line2" when there is a \zs in the pattern after a line
+        // 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
-             * changed flag each time. */
+            // When asking, undo is saved each time, must also set
+            // 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
-             * searching, do the next search in the line where we
-             * found the match. */
+            // If the match found didn't start where we were
+            // searching, do the next search in the line where we
+            // 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
-     * the line number before the change (same as adding the number of
-     * deleted lines). */
+    // 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
+    // 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
-       * specified, the current window is vertically split and
-       * narrow. */
+      // Split off help window; put it at far top if no position
+      // specified, the current window is vertically split and
+      // 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
-   * may have jumped to another window, check that the buffer is not in a
-   * window. */
+  // 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
+  // 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.
-     * Also replace "\%^" and "\%(", they match every tag too.
-     * Also "\zs", "\z1", etc.
-     * Also "\@<", "\@=", "\@<=", etc.
-     * And also "\_$" and "\_^". */
+    // Replace "\S" with "/\\S", etc.  Otherwise every tag is matched.
+    // Also replace "\%^" and "\%(", they match every tag too.
+    // Also "\zs", "\z1", etc.
+    // Also "\@<", "\@=", "\@<=", etc.
+    // 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-N" */
+        // "CTRL-\_" -> "CTRL-\\_" to avoid the special meaning of "\_" in
+        // "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
-     * tag name. */
-    qsort((void *)*matches, (size_t)*num_matches,
+    // Sort the matches found on the heuristic number that is after the
+    // tag name.
+    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) {
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 16a9b78c6a..5193391442 100644
--- a/src/nvim/ex_docmd.c
+++ b/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
-   * the :global command. */
+  // When using ":global /pat/ visual" and then "Q" we return to continue
+  // 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
-           * output doesn't contain empty lines. */
+          // go up one line, to overwrite the ":<CR>" line, so the
+          // 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
-   * line and the debug tick for a function or script are stored. */
+  // 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.
   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
-       * again.  Pass a different "fgetline" function to do_one_cmd()
-       * below, so that it stores lines in or reads them from
-       * "lines_ga".  Makes it possible to define a function inside a
-       * while/for loop. */
+      // Inside a while/for loop we need to store the lines and use them
+      // again.  Pass a different "fgetline" function to do_one_cmd()
+      // below, so that it stores lines in or reads them from
+      // "lines_ga".  Makes it possible to define a function inside a
+      // 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
-       * incremented when defining a function. */
+      // Use "current_line" from "cmd_loop_cookie", it may have been
+      // 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"
-           * or ":for". */
+          // Check for the next breakpoint at or after the ":while"
+          // 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
-     * within this loop. */
+    // Update global "trylevel" for recursive calls to do_cmdline() from
+    // 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
-   * lack was reported above and the error message is to be converted to an
-   * exception, do this now after rewinding the cstack. */
+  // 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
+  // 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
-   * function that's originally used to obtain the lines.  This may be
-   * nested several levels. */
+  // When "fgetline" is "get_loop_line()" use the "cookie" to find the
+  // function that's originally used to obtain the lines.  This may be
+  // 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
-   * cookie that's originally used to obtain the lines.  This may be nested
-   * several levels. */
+  // 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
+  // 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
-       * :delete with the 'l' flag.  Same for 'p'. */
-      for (i = 0; i < len; ++i) {
+      // Check for ":dl", ":dell", etc. to ":deletel": that's
+      // :delete with the 'l' flag.  Same for 'p'.
+      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
-     * literally.  But do expand "~/file", "~user/file" and "$HOME/file". */
+    // Wildcards won't be expanded below, the replacement is taken
+    // 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
-       * remove it later. */
+      // Don't escape a backslash here, because rem_backslash() doesn't
+      // 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
-     * doing ":split" without arguments. */
+    // Reset 'scrollbind' when editing another file, but keep it when
+    // 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
-     * appears several times in the path. */
+    // Repeat finding the file "count" times.  This matters when it
+    // 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)) {