aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2022-10-17 08:19:48 +0200
committerGitHub <noreply@github.com>2022-10-17 08:19:48 +0200
commit9701c9dc9f157c4d09d1783aab9913d05b0d73b1 (patch)
treedd9b7d788960d5a481e14fb720235f456e691636 /runtime/doc
parentd44f088834081ee404db4459fdcfba82d14ef157 (diff)
downloadrneovim-9701c9dc9f157c4d09d1783aab9913d05b0d73b1.tar.gz
rneovim-9701c9dc9f157c4d09d1783aab9913d05b0d73b1.tar.bz2
rneovim-9701c9dc9f157c4d09d1783aab9913d05b0d73b1.zip
vim-patch:3c053a1a5ad2 (#20679)
Update runtime files https://github.com/vim/vim/commit/3c053a1a5ad2a3c924929e11f2b9af20a8b901e2
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/indent.txt9
-rw-r--r--runtime/doc/options.txt2
-rw-r--r--runtime/doc/quickref.txt1
-rw-r--r--runtime/doc/repeat.txt7
-rw-r--r--runtime/doc/syntax.txt15
-rw-r--r--runtime/doc/userfunc.txt4
6 files changed, 30 insertions, 8 deletions
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 5473c7566c..2b86300e7f 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -978,9 +978,12 @@ indentation: >
PYTHON *ft-python-indent*
-The amount of indent can be set for the following situations. The examples
-given are the defaults. Note that the dictionary values are set to an
-expression, so that you can change the value of 'shiftwidth' later.
+The amount of indent can be set with the `g:python_indent` |Dictionary|, which
+needs to be created before adding the items: >
+ let g:python_indent = {}
+The examples given are the defaults. Note that the dictionary values are set
+to an expression, so that you can change the value of 'shiftwidth' later
+without having to update these values.
Indent after an open paren: >
let g:python_indent.open_paren = 'shiftwidth() * 2'
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 3e056ffc28..184a9aeea4 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5949,7 +5949,7 @@ A jump table for the options with a short description can be found at |Q_op|.
For the "screen" and "topline" values, the cursor position will be
changed when necessary. In this case, the jumplist will be populated
with the previous cursor position. For "screen", the text cannot always
- be kept on the same screen line when 'wrap' is enabled.
+ be kept on the same screen line when 'wrap' is enabled.
*'splitright'* *'spr'* *'nosplitright'* *'nospr'*
'splitright' 'spr' boolean (default off)
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index f1261b18ff..f1294a18ba 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -772,6 +772,7 @@ Short explanation of each option: *option-list*
'lines' number of lines in the display
'linespace' 'lsp' number of pixel lines to use between characters
'lisp' automatic indenting for Lisp
+'lispoptions' 'lop' changes how Lisp indenting is done
'lispwords' 'lw' words that change how lisp indenting works
'list' show <Tab> and <EOL>
'listchars' 'lcs' characters for displaying in list mode
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 21945dc499..6a1b8b05a7 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -289,7 +289,7 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
how this can be useful.
This is normally done automatically during startup,
- after loading your .vimrc file. With this command it
+ after loading your |vimrc| file. With this command it
can be done earlier.
Packages will be loaded only once. Using
@@ -540,6 +540,11 @@ You would now have these files under ~/.local/share/nvim/site:
On startup after processing your |config|, Nvim scans all directories in
'packpath' for plugins in "pack/*/start/*", then loads the plugins.
+To allow for calling into package functionality while parsing your |vimrc|,
+|:colorscheme| and |autoload| will both automatically search under 'packpath'
+as well in addition to 'runtimepath'. See the documentation for each for
+details.
+
In the example Nvim will find "pack/foo/start/foobar/plugin/foo.vim" and load
it.
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index f9ca919ddb..48301f3083 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -2986,16 +2986,25 @@ satisfied with it for my own projects.
SED *sed.vim* *ft-sed-syntax*
To make tabs stand out from regular blanks (accomplished by using Todo
-highlighting on the tabs), define "highlight_sedtabs" by putting >
-
- :let highlight_sedtabs = 1
+highlighting on the tabs), define "g:sed_highlight_tabs" by putting >
+ :let g:sed_highlight_tabs = 1
+<
in the vimrc file. (This special highlighting only applies for tabs
inside search patterns, replacement texts, addresses or text included
by an Append/Change/Insert command.) If you enable this option, it is
also a good idea to set the tab width to one character; by doing that,
you can easily count the number of tabs in a string.
+GNU sed allows comments after text on the same line. BSD sed only allows
+comments where "#" is the first character of the line. To enforce BSD-style
+comments, i.e. mark end-of-line comments as errors, use: >
+
+ :let g:sed_dialect = "bsd"
+<
+Note that there are other differences between GNU sed and BSD sed which are
+not (yet) affected by this setting.
+
Bugs:
The transform command (y) is treated exactly like the substitute
diff --git a/runtime/doc/userfunc.txt b/runtime/doc/userfunc.txt
index 5462fa952c..641c95b06e 100644
--- a/runtime/doc/userfunc.txt
+++ b/runtime/doc/userfunc.txt
@@ -388,6 +388,10 @@ file should then define the function like this: >
echo "Done!"
endfunction
+If the file doesn't exist, Vim will also search in 'packpath' (under "start")
+to allow calling packages' functions from your |vimrc| when the packages have
+not been added to 'runtimepath' yet (see |packages|).
+
The file name and the name used before the # in the function must match
exactly, and the defined function must have the name exactly as it will be
called.