patch 8.0.0164: outdated and misplaced comments

Problem:    Outdated and misplaced comments.
Solution:   Fix the comments.

diff --git a/src/charset.c b/src/charset.c
index 134cd095165f2c5ee0977749d28a9eabc5344aa8..c3b62590bcc1fc57e649b06b5c921516fe8b6917 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -887,7 +887,7 @@ vim_isIDc(int c)
 
 /*
  * return TRUE if 'c' is a keyword character: Letters and characters from
- * 'iskeyword' option for current buffer.
+ * 'iskeyword' option for the current buffer.
  * For multi-byte characters mb_get_class() is used (builtin rules).
  */
     int

diff --git a/src/getchar.c b/src/getchar.c
index 3657433a5175757c9cca1482d45f56c1366d607f..9adeafa5ba931d7faa700eb24a91ffda59c818aa 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -978,23 +978,22 @@ ins_typebuf(
 
     addlen = (int)STRLEN(str);
 
-    /*
-     * Easy case: there is room in front of typebuf.tb_buf[typebuf.tb_off]
-     */
     if (offset == 0 && addlen <= typebuf.tb_off)
     {
+       /*
+        * Easy case: there is room in front of typebuf.tb_buf[typebuf.tb_off]
+        */
        typebuf.tb_off -= addlen;
        mch_memmove(typebuf.tb_buf + typebuf.tb_off, str, (size_t)addlen);
     }
-
-    /*
-     * Need to allocate a new buffer.
-     * In typebuf.tb_buf there must always be room for 3 * MAXMAPLEN + 4
-     * characters.  We add some extra room to avoid having to allocate too
-     * often.
-     */
     else
     {
+       /*
+        * Need to allocate a new buffer.
+        * In typebuf.tb_buf there must always be room for 3 * MAXMAPLEN + 4
+        * characters.  We add some extra room to avoid having to allocate too
+        * often.
+        */
        newoff = MAXMAPLEN + 4;
        newlen = typebuf.tb_len + addlen + newoff + 4 * (MAXMAPLEN + 4);
        if (newlen < 0)             /* string is getting too long */
@@ -2009,7 +2008,7 @@ vgetorpeek(int advance)
            {
                /* KeyTyped = FALSE;  When the command that stuffed something
                 * was typed, behave like the stuffed command was typed.
-                * needed for CTRL-W CTRl-] to open a fold, for example. */
+                * needed for CTRL-W CTRL-] to open a fold, for example. */
                KeyStuffed = TRUE;
            }
            if (typebuf.tb_no_abbr_cnt == 0)

diff --git a/src/list.c b/src/list.c
index 83caed62f12dec51c7895dad1c376792254312bd..50d38ff87c0d48654f1ce1ac676428403fd30b75 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -885,7 +885,7 @@ failret:
 }
 
 /*
- * Write list of strings to file
+ * Write "list" of strings to file "fd".
  */
     int
 write_list(FILE *fd, list_T *list, int binary)

diff --git a/src/misc2.c b/src/misc2.c
index afafee1600a034bc87f6e57093b2ed8c765c441b..c26f90075b449d6f2926b98f94686ea08f0e2ee7 100644 (file)
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -403,7 +403,7 @@ incl(pos_T *lp)
     int
 dec_cursor(void)
 {
- return dec(&curwin->w_cursor);
+    return dec(&curwin->w_cursor);
 }
 
     int

diff --git a/src/testdir/README.txt b/src/testdir/README.txt
index 640c61d1bd283162a91bb39062a81f43f9bd0b9e..6cdf12fffb6dfd091f4e6573217c3e9f5491ac2a 100644 (file)
--- a/src/testdir/README.txt
+++ b/src/testdir/README.txt
@@ -14,10 +14,10 @@ can.  Use an old style test when it needs to run without the +eval feature.
 TO ADD A NEW STYLE TEST:
 
 1) Create a test_<subject>.vim file.
-2) Add test_<subject>.vim to NEW_TESTS in Make_all.mak in alphabetical order.
-3) Use make test_<subject>.res to run a single test in src/testdir/.
+2) Add test_<subject>.res to NEW_TESTS in Make_all.mak in alphabetical order.
+3) Also add an entry in src/Makefile.
+4) Use make test_<subject>.res to run a single test in src/testdir/.
    Use make test_<subject>  to run a single test in src/.
-4) Also add an entry in src/Makefile.
 
 What you can use (see test_assert.vim for an example):
 - Call assert_equal(), assert_true(), assert_false(), etc.

diff --git a/src/version.c b/src/version.c
index 9b0809bf6ab3298c2da07effb9ab7ba328f02aa4..36143206a5683d41bb2191f6514384430d07591b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    164,
 /**/
     163,
 /**/