aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc/vim_diff.txt
diff options
context:
space:
mode:
authorGregory Anders <8965202+gpanders@users.noreply.github.com>2022-11-17 08:47:41 -0700
committerGitHub <noreply@github.com>2022-11-17 08:47:41 -0700
commit32cba4cee6c2ca232b5def16fe1bae8166d093f1 (patch)
tree31cb31b570e2263250471ea2ee08be1b41ac8d31 /runtime/doc/vim_diff.txt
parent9736605672e8648bbe8739a6fdd1c315183bce40 (diff)
parent6d9c3d903ecee2d1d21d0a0806f1a2bebe628e8e (diff)
downloadrneovim-32cba4cee6c2ca232b5def16fe1bae8166d093f1.tar.gz
rneovim-32cba4cee6c2ca232b5def16fe1bae8166d093f1.tar.bz2
rneovim-32cba4cee6c2ca232b5def16fe1bae8166d093f1.zip
Merge pull request #20956 from gpanders/lua-readsecure
feat: implement vim.secure.read() and use it for 'exrc'
Diffstat (limited to 'runtime/doc/vim_diff.txt')
-rw-r--r--runtime/doc/vim_diff.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index fe6c28c809..b5222c9ddd 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -417,6 +417,8 @@ Options:
'jumpoptions' "view" tries to restore the |mark-view| when moving through
the |jumplist|, |changelist|, |alternate-file| or using |mark-motions|.
'shortmess' the "F" flag does not affect output from autocommands
+ 'exrc' searches for ".nvimrc" or ".exrc" files. The user is prompted whether
+ to trust the file.
Shell:
Shell output (|:!|, |:make|, …) is always routed through the UI, so it
@@ -639,6 +641,9 @@ Options:
*'prompt'* *'noprompt'*
*'remap'* *'noremap'*
*'restorescreen'* *'rs'* *'norestorescreen'* *'nors'*
+ *'secure'*
+ Everything is allowed in 'exrc' files since they must be explicitly marked
+ trusted.
*'shelltype'*
*'shortname'* *'sn'* *'noshortname'* *'nosn'*
*'swapsync'* *'sws'*