diff options
| author | Marco Hinz <mh.codebro@gmail.com> | 2015-11-11 01:00:04 +0100 |
|---|---|---|
| committer | Marco Hinz <mh.codebro@gmail.com> | 2015-11-11 22:50:14 +0100 |
| commit | 85b1052c3ceeaeae7da907707d7bbdce8d71f642 (patch) | |
| tree | ce789d21e26d500e6263d22abf29696b8e81692e /runtime | |
| parent | 947e356cdaa931bec9b2314c36bbfed926514030 (diff) | |
| download | rneovim-85b1052c3ceeaeae7da907707d7bbdce8d71f642.tar.gz rneovim-85b1052c3ceeaeae7da907707d7bbdce8d71f642.tar.bz2 rneovim-85b1052c3ceeaeae7da907707d7bbdce8d71f642.zip | |
Remove all invalid nvimrc and ngvimrc references
"vimrc" refers to all files that are used to configure Neovim. The main
configuration file is init.vim nowadays.
All nvimrc references that are left refer to a local ".nvimrc" which is read
if 'exrc' is set. ".ngvimrc" references were completely wiped.
Closes #3552.
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: "") |