aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-10-28 14:05:39 +0100
committerJustin M. Keyes <justinkz@gmail.com>2018-10-28 14:07:58 +0100
commit733b4ce0339f2fdcdb0db67717fc090dcfecf250 (patch)
treedc9498c3ac8b8d71933f785502c0689be8cd07ec /runtime/doc
parent1a51524ad540da00736027313cd89747c86c1690 (diff)
downloadrneovim-733b4ce0339f2fdcdb0db67717fc090dcfecf250.tar.gz
rneovim-733b4ce0339f2fdcdb0db67717fc090dcfecf250.tar.bz2
rneovim-733b4ce0339f2fdcdb0db67717fc090dcfecf250.zip
vim-patch:7254067ee970
Update runtime files. https://github.com/vim/vim/commit/7254067ee970686cc3ff4a1effc3e49e9192a5c1
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/autocmd.txt2
-rw-r--r--runtime/doc/eval.txt2
-rw-r--r--runtime/doc/filetype.txt2
-rw-r--r--runtime/doc/if_pyth.txt8
-rw-r--r--runtime/doc/message.txt3
-rw-r--r--runtime/doc/pattern.txt2
-rw-r--r--runtime/doc/syntax.txt9
7 files changed, 12 insertions, 16 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 2f9d8aa7f7..6cbcd1e6f9 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -20,7 +20,7 @@ files matching *.c. You can also use autocommands to implement advanced
features, such as editing compressed files (see |gzip-example|). The usual
place to put autocommands is in your vimrc file.
- *E203* *E204* *E143* *E855* *E937*
+ *E203* *E204* *E143* *E855* *E937* *E952*
WARNING: Using autocommands is very powerful, and may lead to unexpected side
effects. Be careful not to destroy your text.
- It's a good idea to do some testing on an expendable copy of a file first.
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 7b1857883b..d86c527857 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -5569,8 +5569,6 @@ matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])
< Matches added by |matchaddpos()| are returned by
|getmatches()| with an entry "pos1", "pos2", etc., with the
value a list like the {pos} item.
- These matches cannot be set via |setmatches()|, however they
- can still be deleted by |clearmatches()|.
matcharg({nr}) *matcharg()*
Selects the {nr} match item, as set with a |:match|,
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 4d16a2eaf6..286d96b684 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -570,7 +570,7 @@ By default the following options are set, in accordance with PEP8: >
setlocal expandtab shiftwidth=4 softtabstop=4 tabstop=8
To disable this behaviour, set the following variable in your vimrc: >
-
+
let g:python_recommended_style = 0
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index 62fd4cc8d4..384406150f 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -717,14 +717,14 @@ To avoid loading the dynamic library, only check if Vim was compiled with
python support: >
if has('python_compiled')
echo 'compiled with Python 2.x support'
- if has('python_dynamic
- echo 'Python 2.x dynamically loaded
+ if has('python_dynamic')
+ echo 'Python 2.x dynamically loaded'
endif
endif
if has('python3_compiled')
echo 'compiled with Python 3.x support'
- if has('python3_dynamic
- echo 'Python 3.x dynamically loaded
+ if has('python3_dynamic')
+ echo 'Python 3.x dynamically loaded'
endif
endif
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index 96c28009c4..821d21a7b6 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -69,7 +69,7 @@ See `:messages` above.
LIST OF MESSAGES
*E222* *E228* *E232* *E256* *E293* *E298* *E304* *E317*
*E318* *E356* *E438* *E439* *E440* *E316* *E320* *E322*
- *E323* *E341* *E473* *E570* *E685* >
+ *E323* *E341* *E473* *E570* *E685* *E950* >
Add to read buffer
makemap: Illegal mode
Cannot create BalloonEval with both message and callback
@@ -90,6 +90,7 @@ LIST OF MESSAGES
Internal error
Internal error: {function}
fatal error in cs_manage_matches
+ Invalid count for del_bytes(): {N}
This is an internal error. If you can reproduce it, please send in a bug
report. |bugs|
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index cc485b655d..cd37e4fa02 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -888,7 +888,7 @@ $ At end of pattern or in front of "\|", "\)" or "\n" ('magic' on):
becomes invalid. Vim doesn't automatically update the matches.
Similar to moving the cursor for "\%#" |/\%#|.
- */\%l* */\%>l* */\%<l*
+ */\%l* */\%>l* */\%<l* *E951*
\%23l Matches in a specific line.
\%<23l Matches above a specific line (lower line number).
\%>23l Matches below a specific line (higher line number).
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 6e768f599f..3a2ed65a1b 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -2748,13 +2748,10 @@ Ruby syntax will perform spellchecking of strings if you define
SCHEME *scheme.vim* *ft-scheme-syntax*
-By default only R5RS keywords are highlighted and properly indented.
+By default only R7RS keywords are highlighted and properly indented.
-MzScheme-specific stuff will be used if b:is_mzscheme or g:is_mzscheme
-variables are defined.
-
-Also scheme.vim supports keywords of the Chicken Scheme->C compiler. Define
-b:is_chicken or g:is_chicken, if you need them.
+scheme.vim also supports extensions of the CHICKEN Scheme->C compiler.
+Define b:is_chicken or g:is_chicken, if you need them.
SDL *sdl.vim* *ft-sdl-syntax*