aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2015-10-17 21:53:16 +0300
committerZyX <kp-pav@yandex.ru>2015-10-23 14:54:11 +0300
commitafcc842881d2569c11da26a75057062ba4f124e7 (patch)
tree97bfa86757c03ddf4980a7c0a3ffb7983c6bbcb8 /runtime
parenta82a059921f36fb580026ef4cc31f64c110d07b7 (diff)
downloadrneovim-afcc842881d2569c11da26a75057062ba4f124e7.tar.gz
rneovim-afcc842881d2569c11da26a75057062ba4f124e7.tar.bz2
rneovim-afcc842881d2569c11da26a75057062ba4f124e7.zip
main,version: Remove USR_EXRC_FILE*
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/map.txt2
-rw-r--r--runtime/doc/starting.txt5
2 files changed, 2 insertions, 5 deletions
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index d560fbf266..ab49b6f889 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1046,7 +1046,7 @@ You type: ab esc ^V^V^V^V^V^[
You see: ab esc ^V^V^[
The command-line contains two actual ^Vs before the ^[. This is
- how it should appear in your .exrc file, if you choose to go that
+ how it should appear in your vimrc file, if you choose to go that
route. The first ^V is there to quote the second ^V; the :ab
command uses ^V as its own quote character, so you can include quoted
whitespace or the | character in the abbreviation. The :ab command
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 937de7a45e..b0f2f80ad3 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -407,7 +407,7 @@ accordingly. Vim proceeds in this order:
":version" command. Mostly it's "$VIM/vimrc".
For the Macintosh the $VIMRUNTIME/macmap.vim is read.
- *VIMINIT* *EXINIT* *.exrc* *_exrc* *$MYVIMRC*
+ *VIMINIT* *EXINIT* *$MYVIMRC*
b. Four places are searched for initializations. The first that exists
is used, the others are ignored. The $MYVIMRC environment variable is
set to the file that was first found, unless $MYVIMRC was already set
@@ -417,9 +417,6 @@ accordingly. Vim proceeds in this order:
- The user vimrc file: $XDG_CONFIG_HOME/nvim/init.vim.
- The environment variable EXINIT.
The value of $EXINIT is used as an Ex command line.
- - The user exrc file(s). Same as for the user vimrc file, but with
- "vimrc" replaced by "exrc". But only one of ".exrc" and "_exrc" is
- used, depending on the system.
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,