aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-04-22 22:53:42 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-04-27 09:21:27 -0400
commit766a10783982936da8f1eaf61280338fcd85019a (patch)
treee897baaf11ef239333136aa6d10a46423e2bbfba /runtime/doc
parentd6cef4ef9d75556d9ae1c39c3fd0becb3939f621 (diff)
downloadrneovim-766a10783982936da8f1eaf61280338fcd85019a.tar.gz
rneovim-766a10783982936da8f1eaf61280338fcd85019a.tar.bz2
rneovim-766a10783982936da8f1eaf61280338fcd85019a.zip
vim-patch:589edb340454
Updte runtime files https://github.com/vim/vim/commit/589edb340454e7f1b19358f129287a636d53d0e1 Omit state() changes in eval.txt because patch v8.1.2047 is not merged.
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/options.txt4
-rw-r--r--runtime/doc/repeat.txt4
-rw-r--r--runtime/doc/syntax.txt10
3 files changed, 14 insertions, 4 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 63a9db9d0d..910997cb1e 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -6713,8 +6713,8 @@ A jump table for the options with a short description can be found at |Q_op|.
":map <BS> X" to make backspace delete the character in front of the
cursor.
When 'l' is included and it is used after an operator at the end of a
- line then it will not move to the next line. This makes "dl", "cl",
- "yl" etc. work normally.
+ line (not an empty line) then it will not move to the next line. This
+ makes "dl", "cl", "yl" etc. work normally.
*'wildchar'* *'wc'*
'wildchar' 'wc' number (Vim default: <Tab>, Vi default: CTRL-E)
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 3a7337d2e8..e9e0ec0581 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -206,10 +206,10 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
When {file} contains wildcards it is expanded to all
matching files. Example: >
- :runtime! plugin/*.vim
+ :runtime! plugin/**/*.vim
< This is what Vim uses to load the plugin files when
starting up. This similar command: >
- :runtime plugin/*.vim
+ :runtime plugin/**/*.vim
< would source the first file only.
When 'verbose' is one or higher, there is a message
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index aeee02a1e0..7491577d8b 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1892,6 +1892,16 @@ displayed line. The default value is 10. The disadvantage of using a larger
number is that redrawing can become slow.
+JSON *json.vim* *ft-json-syntax*
+
+The json syntax file provides syntax highlighting with conceal support by
+default. To disable concealment: >
+ let g:vim_json_conceal = 0
+
+To disable syntax highlighting of errors: >
+ let g:vim_json_warnings = 0
+
+
LACE *lace.vim* *ft-lace-syntax*
Lace (Language for Assembly of Classes in Eiffel) is case insensitive, but the