summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-01-10 13:51:09 +0100
committerBram Moolenaar <Bram@vim.org>2017-01-10 13:51:09 +0100
commitcaa55b65c204946d160c1b743c5f8f3b506dc4d3 (patch)
tree3dd961455a51a51c70020597080d9014aa37366b
parent68563937f58ea2dc31b58739336c383d2fd7e6cf (diff)
downloadvim-git-caa55b65c204946d160c1b743c5f8f3b506dc4d3.tar.gz
patch 8.0.0164: outdated and misplaced commentsv8.0.0164
Problem: Outdated and misplaced comments. Solution: Fix the comments.
-rw-r--r--src/charset.c2
-rw-r--r--src/getchar.c21
-rw-r--r--src/list.c2
-rw-r--r--src/misc2.c2
-rw-r--r--src/testdir/README.txt6
-rw-r--r--src/version.c2
6 files changed, 18 insertions, 17 deletions
diff --git a/src/charset.c b/src/charset.c
index 134cd0951..c3b62590b 100644
--- 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 3657433a5..9adeafa5b 100644
--- 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 83caed62f..50d38ff87 100644
--- 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 afafee160..c26f90075 100644
--- 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 640c61d1b..6cdf12fff 100644
--- 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 9b0809bf6..36143206a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 164,
+/**/
163,
/**/
162,