aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorckelsel <ckelsel@hotmail.com>2017-09-24 09:16:59 +0800
committerckelsel <ckelsel@hotmail.com>2017-09-24 09:16:59 +0800
commit90fc9039ddcadc61d4236bdd2d638d690081e04d (patch)
treeecf08d95a7c9459fa5a79202d85e6666c3f5ee88 /runtime/doc
parent6258e33b114dc4386e608a5cf3a48742757441f7 (diff)
parent4bb0e95abbf0a61d383d5261019a2667706c9d39 (diff)
downloadrneovim-90fc9039ddcadc61d4236bdd2d638d690081e04d.tar.gz
rneovim-90fc9039ddcadc61d4236bdd2d638d690081e04d.tar.bz2
rneovim-90fc9039ddcadc61d4236bdd2d638d690081e04d.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/editing.txt2
-rw-r--r--runtime/doc/syntax.txt7
2 files changed, 4 insertions, 5 deletions
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 9fe815ea9c..8974a5c64e 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1271,7 +1271,7 @@ Commands for changing the working directory can be suffixed with a bang "!"
*:lcd-*
:lcd[!] - Change to the previous current directory (before the
- previous ":tcd {path}" command).
+ previous ":lcd {path}" command).
*:pw* *:pwd* *E187*
:pw[d] Print the current directory name.
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index fd17e3b381..73841edb09 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -3270,11 +3270,10 @@ improve screen updating rates (see |:syn-sync| for more on this). >
The g:vimsyn_embed option allows users to select what, if any, types of
embedded script highlighting they wish to have. >
- g:vimsyn_embed == 0 : don't embed any scripts
- g:vimsyn_embed =~ 'P' : support embedded python
+ g:vimsyn_embed == 0 : disable (don't embed any scripts)
+ g:vimsyn_embed == 'lPr' : support embedded lua, python and ruby
<
-By default, g:vimsyn_embed is a string supporting interpreters that your vim
-itself supports.
+This option is disabled by default.
*g:vimsyn_folding*
Some folding is now supported with syntax/vim.vim: >