diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-11-11 17:37:07 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-11-11 17:37:07 -0500 |
| commit | 5434a05457a0f9f8c9089731c40d5d444b328b28 (patch) | |
| tree | 0f2bcb86962abafb31027cb61165db5433ec557f /runtime | |
| parent | bb43d9b9a2aae7f799eed4fc4f793afd6e466d7d (diff) | |
| parent | 85b1052c3ceeaeae7da907707d7bbdce8d71f642 (diff) | |
| download | rneovim-5434a05457a0f9f8c9089731c40d5d444b328b28.tar.gz rneovim-5434a05457a0f9f8c9089731c40d5d444b328b28.tar.bz2 rneovim-5434a05457a0f9f8c9089731c40d5d444b328b28.zip | |
Merge pull request #3651 from mhinz/remove-nvimrc-refs
Remove all invalid nvimrc references
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/gui.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index 90f772c46f..c74c31d1fa 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -61,10 +61,6 @@ When the GUI starts up initializations are carried out, in this order: ~/.config). The name of the first file found is stored in $MYGVIMRC, unless it was already set. -- If the 'exrc' option is set (which is NOT the default) the file ./.ngvimrc - is sourced, if it exists and isn't the same file as the system or user - gvimrc file. If this file is not owned by you, some security restrictions - apply. When ".ngvimrc" is not found, "_ngvimrc" is tried too. NOTE: All but the first one are not carried out if Vim was started with "-u NONE" and no "-U" argument was given, or when started with "-U NONE". diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index c3a8be1038..2b1044bead 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -2295,13 +2295,13 @@ 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, .exrc and .ngvimrc in the current - directory. If you switch this option on you should also consider - setting the 'secure' option (see |initialization|). Using a local - .exrc, .nvimrc or .ngvimrc is a potential security leak, use with care! - also see |init.vim| and |gui-init|. + 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! This option cannot be set from a |modeline| or in the |sandbox|, for security reasons. + Also see |init.vim| and |gui-init|. *'fileencoding'* *'fenc'* *E213* 'fileencoding' 'fenc' string (default: "") |