summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-02-26 13:43:51 +0100
committerBram Moolenaar <Bram@vim.org>2020-02-26 13:43:51 +0100
commitd672dde584effd55702ee15efec4cb2a8c77bf85 (patch)
tree742fb3cd5f535e1571827c81060572ce735ef96d
parentbc93cebb692f47488d66f078d1728031e9be35e7 (diff)
downloadvim-git-d672dde584effd55702ee15efec4cb2a8c77bf85.tar.gz
patch 8.2.0319: file missing in distribution, comments outdatedv8.2.0319
Problem: File missing in distribution, comments outdated. Solution: Correct path of README file. Update comments.
-rw-r--r--Filelist2
-rw-r--r--src/evalvars.c1
-rw-r--r--src/if_python3.c2
-rw-r--r--src/register.c4
-rw-r--r--src/version.c2
5 files changed, 7 insertions, 4 deletions
diff --git a/Filelist b/Filelist
index 41eb53f5a..f5328a5d5 100644
--- a/Filelist
+++ b/Filelist
@@ -14,7 +14,6 @@ SRC_ALL = \
ci/if_ver*.vim \
src/Make_all.mak \
src/README.md \
- src/README_VIM9.md \
src/alloc.h \
src/arabic.c \
src/arglist.c \
@@ -661,6 +660,7 @@ SRC_EXTRA = \
RT_ALL = \
README.txt \
README.md \
+ README_VIM9.md \
LICENSE \
CONTRIBUTING.md \
runtime/bugreport.vim \
diff --git a/src/evalvars.c b/src/evalvars.c
index 25d23c860..894ee287d 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -669,6 +669,7 @@ heredoc_get(exarg_T *eap, char_u *cmd)
* ":let var ..= expr" assignment command.
* ":let [var1, var2] = expr" unpack list.
* ":let var =<< ..." heredoc
+ * ":let var: string" Vim9 declaration
*/
void
ex_let(exarg_T *eap)
diff --git a/src/if_python3.c b/src/if_python3.c
index 8c22514b7..6e4b81acd 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -1641,7 +1641,7 @@ LineToString(const char *str)
{
PyObject *result;
Py_ssize_t len = strlen(str);
- char *tmp,*p;
+ char *tmp, *p;
tmp = alloc(len + 1);
p = tmp;
diff --git a/src/register.c b/src/register.c
index 696000246..943298e97 100644
--- a/src/register.c
+++ b/src/register.c
@@ -2617,14 +2617,14 @@ getreg_wrap_one_line(char_u *s, int flags)
}
/*
- * Return the contents of a register as a single allocated string.
+ * Return the contents of a register as a single allocated string or as a list.
* Used for "@r" in expressions and for getreg().
* Returns NULL for error.
* Flags:
* GREG_NO_EXPR Do not allow expression register
* GREG_EXPR_SRC For the expression register: return expression itself,
* not the result of its evaluation.
- * GREG_LIST Return a list of lines in place of a single string.
+ * GREG_LIST Return a list of lines instead of a single string.
*/
char_u *
get_reg_contents(int regname, int flags)
diff --git a/src/version.c b/src/version.c
index c5dccf4d4..e3ff8e15c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 319,
+/**/
318,
/**/
317,