summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-05-22 14:50:16 +0100
committerBram Moolenaar <Bram@vim.org>2022-05-22 14:50:16 +0100
commit835ee980eedd1aa0fa2d731312ce38697a12a897 (patch)
tree6c206e5cd8175adeab64825a07eb23c5c1896dd9
parentaa9729b652aa93b547b5c7006f54a143d99ea149 (diff)
downloadvim-git-835ee980eedd1aa0fa2d731312ce38697a12a897.tar.gz
patch 8.2.5000: no patch for documentation updatesv8.2.5000
Problem: No patch for documentation updates. Solution: Update documentation files.
-rw-r--r--runtime/doc/builtin.txt2
-rw-r--r--runtime/doc/indent.txt2
-rw-r--r--runtime/doc/options.txt2
-rw-r--r--runtime/doc/os_win32.txt7
-rw-r--r--runtime/doc/todo.txt12
-rw-r--r--runtime/doc/usr_52.txt45
-rw-r--r--runtime/doc/various.txt2
-rw-r--r--runtime/doc/vim9.txt2
-rw-r--r--src/version.c2
9 files changed, 37 insertions, 39 deletions
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 781f8eba8..29cc50627 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1,4 +1,4 @@
-*builtin.txt* For Vim version 8.2. Last change: 2022 May 10
+*builtin.txt* For Vim version 8.2. Last change: 2022 May 21
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 2899fc5b3..4df0909f4 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -1,4 +1,4 @@
-*indent.txt* For Vim version 8.2. Last change: 2022 Apr 07
+*indent.txt* For Vim version 8.2. Last change: 2022 May 21
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index b4359190d..f1038afa6 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 8.2. Last change: 2022 May 07
+*options.txt* For Vim version 8.2. Last change: 2022 May 21
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt
index 6fe56c09e..62376c7f2 100644
--- a/runtime/doc/os_win32.txt
+++ b/runtime/doc/os_win32.txt
@@ -1,4 +1,4 @@
-*os_win32.txt* For Vim version 8.2. Last change: 2022 Feb 14
+*os_win32.txt* For Vim version 8.2. Last change: 2022 May 22
VIM REFERENCE MANUAL by George Reilly
@@ -42,6 +42,11 @@ The GUI version was made by George V. Reilly and Robert Webb.
For compiling see "src/INSTALLpc.txt". *win32-compiling*
+ *WSL*
+When using Vim on WSL (Windows Subsystem for Linux) the remarks here do not
+apply, `has('win32')` will return false then. In case you need to know
+whether Vim is running on WSL you can use `exists('$WSLENV')`.
+
==============================================================================
1. Known problems *win32-problems*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index d2a5dbdd1..fa2cded4f 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 8.2. Last change: 2022 May 21
+*todo.txt* For Vim version 8.2. Last change: 2022 May 22
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -38,20 +38,14 @@ browser use: https://github.com/vim/vim/issues/1234
*known-bugs*
-------------------- Known bugs and current work -----------------------
-Make :defcompile accept a function argument, like :disassemble
-Useful for global functions.
-
-Once Vim9 is stable:
+Prepare for Vim 9.0 release:
- Use Vim9 for more runtime files.
-- Check code coverage, add more tests if needed.
+- Check Vim9 code coverage, add more tests if needed.
vim9instr.c
vim9script.c
vim9type.c
-- Inlude new set of colors: #9795
- Adjust intro message to say "help version9".
-Graduate FEAT_CINDENT and FEAT_SMARTINDENT ?
-
Update the user manual:
- Update usr_41.txt for Vim9 script
- Fill usr_50.txt as an "advanced section" of usr_41.txt
diff --git a/runtime/doc/usr_52.txt b/runtime/doc/usr_52.txt
index 1fbd66f3c..375fa5dd3 100644
--- a/runtime/doc/usr_52.txt
+++ b/runtime/doc/usr_52.txt
@@ -1,4 +1,4 @@
-*usr_52.txt* For Vim version 8.2. Last change: 2022 May 16
+*usr_52.txt* For Vim version 8.2. Last change: 2022 May 21
VIM USER MANUAL - by Bram Moolenaar
@@ -113,36 +113,33 @@ Although it's shorter to do: >
Legacy Vim script only checks types at runtime, when the code is executed.
And it's permissive, often a computation gives an unexpected value instead of
reporting an error. Thus you can define a function and think it's fine, but
-see a problem only later when it is called: >
- let s:collected = ''
- func ExtendAndReturn(add)
- let s:collected += a:add
- return s:collected
+notice a problem only later when the function is called: >
+ func Concatenate(base, add)
+ return a:base + a:add
endfunc
Can you spot the error? Try this: >
- echo ExtendAndReturn('text')
-And you'll see zero. Why? Because in legacy Vim script "+=" will convert the
-arguments to numbers, and any string without a number results in zero!
-
-With `:def` the type checking happens when compiling the function. For that
-you need to specify the argument types and the return type. Also notice that
-the argument is used without the "a:" prefix: >
- let s:collected = ''
- def ExtendAndReturn(add: string): string
- s:collected += add
- return s:collected
+ echo Concatenate('base', 'text')
+And you'll see zero. Why? Because in legacy Vim script "+" will convert the
+arguments to numbers, and any string without a number results in zero! That's
+not what you expected.
+
+With `:def` the type checking happens when compiling the function. You need
+to specify the argument types and the return type to make that possible. Also
+notice that the argument names are used without the "a:" prefix: >
+ def Concatenate(base: string, add: string): string
+ return base + add
enddef
- disassemble ExtendAndReturn
+ defcompile Concatenate
-Here we use `:disassemble` to do the compilation right away, without it the
-compilation would happen when the function is called. Vim will tell you what
-you did wrong: >
+Here we use `:defcompile` to do the compilation right away, without it the
+compilation would happen when the function is first called. Vim will tell you
+what you did wrong: >
E1051: Wrong argument type for +
-Side note: here the context is legacy script, when using Vim9 script you would
-put `:defcompile` at the end of the script to check for errors in the
-functions defined in it.
+Side note: here the context is legacy script. When using Vim9 script you
+would put `:defcompile` at the end of the script to check for errors in all
+the functions defined in it.
Vim9 script is strict, it uses the "+" operator only for numbers and floats.
For string concatenation ".." must be used. This avoids mistakes and avoids
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 8bfaeaecd..d09dac48f 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt* For Vim version 8.2. Last change: 2022 Apr 03
+*various.txt* For Vim version 8.2. Last change: 2022 May 21
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/vim9.txt b/runtime/doc/vim9.txt
index 479edc57c..069dac48e 100644
--- a/runtime/doc/vim9.txt
+++ b/runtime/doc/vim9.txt
@@ -1,4 +1,4 @@
-*vim9.txt* For Vim version 8.2. Last change: 2022 May 13
+*vim9.txt* For Vim version 8.2. Last change: 2022 May 21
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/src/version.c b/src/version.c
index 17a8787f8..00a784468 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5000,
+/**/
4999,
/**/
4998,