diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-04-28 21:01:49 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-04-28 21:06:07 +0200 |
| commit | f09651ea78b833d6d05db89c41df603b741ab000 (patch) | |
| tree | c07880d891c143c2c3af996597496e59496cf1ad /runtime/doc | |
| parent | 409e56b1392c431a36c0a48cac58d6df3cf424d7 (diff) | |
| download | rneovim-f09651ea78b833d6d05db89c41df603b741ab000.tar.gz rneovim-f09651ea78b833d6d05db89c41df603b741ab000.tar.bz2 rneovim-f09651ea78b833d6d05db89c41df603b741ab000.zip | |
vim-patch:36f44c21da2e
Updated runtime files.
https://github.com/vim/vim/commit/36f44c21da2e912c008683a0c4447fca2a071e9a
Diffstat (limited to 'runtime/doc')
| -rw-r--r-- | runtime/doc/eval.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 13 | ||||
| -rw-r--r-- | runtime/doc/starting.txt | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 107dd28ecd..90575e3438 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -3044,6 +3044,8 @@ delete({fname} [, {flags}]) *delete()* When {flags} is "rf": Deletes the directory by the name {fname} and everything in it, recursively. BE CAREFUL! + Note: on MS-Windows it is not possible to delete a directory + that is being used. The result is a Number, which is 0 if the delete operation was successful and -1 when the deletion failed or partly failed. @@ -6167,7 +6169,7 @@ rpcstop({channel}) {Nvim} *rpcstop()* connecting to |v:servername|. screenattr(row, col) *screenattr()* - Like screenchar(), but return the attribute. This is a rather + Like |screenchar()|, but return the attribute. This is a rather arbitrary number that can only be used to compare to the attribute at other positions. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 6b96271c4a..cef01eb27b 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -2219,10 +2219,15 @@ A jump table for the options with a short description can be found at |Q_op|. *'exrc'* *'ex'* *'noexrc'* *'noex'* 'exrc' 'ex' boolean (default off) global - Enables the reading of .nvimrc and .exrc in the current directory. - If you switch this option on you should also consider setting the - 'secure' option (see |initialization|). Using this option comes - with a potential security risk, use with care! + Enables the reading of .vimrc and .exrc in the current directory. + Setting this option is a potential security leak. E.g., consider + unpacking a package or fetching files from github, a .vimrc in there + might be a trojan horse. BETTER NOT SET THIS OPTION! + Instead, define an autocommand in your .vimrc to set options for a + matching directory. + + If you do switch this option on you should also consider setting the + 'secure' option (see |initialization|). This option cannot be set from a |modeline| or in the |sandbox|, for security reasons. Also see |init.vim| and |gui-init|. diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index c93c3d0741..f7c47125f1 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -425,7 +425,7 @@ accordingly. Vim proceeds in this order: - The environment variable EXINIT. The value of $EXINIT is used as an Ex command line. - c. If the 'exrc' option is on (which is not the default), the current + c. If the 'exrc' option is on (which is NOT the default), the current directory is searched for three files. The first that exists is used, the others are ignored. - The file ".nvimrc" (for Unix) |