diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_cmds2.c | 4 | ||||
| -rw-r--r-- | src/nvim/globals.h | 2 | ||||
| -rw-r--r-- | src/nvim/main.c | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index ba17423475..a632a3cce4 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -2412,9 +2412,7 @@ do_source ( */ p = path_tail(fname_exp); if ((*p == '.' || *p == '_') - && (STRICMP(p + 1, "nvimrc") == 0 - || STRICMP(p + 1, "ngvimrc") == 0 - || STRICMP(p + 1, "exrc") == 0)) { + && (STRICMP(p + 1, "nvimrc") == 0 || STRICMP(p + 1, "exrc") == 0)) { if (*p == '_') *p = '.'; else diff --git a/src/nvim/globals.h b/src/nvim/globals.h index 0ef0a12889..7c42238d20 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -633,7 +633,7 @@ EXTERN int silent_mode INIT(= FALSE); /* set to TRUE when "-s" commandline argument * used for ex */ -// Set to true when sourcing of startup scripts (nvimrc) is done. +// Set to true when sourcing of startup scripts (init.vim) is done. // Used for options that cannot be changed after startup scripts. EXTERN bool did_source_startup_scripts INIT(= false); diff --git a/src/nvim/main.c b/src/nvim/main.c index 43723ff363..0020ce3c97 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -1833,7 +1833,7 @@ static void usage(void) mch_msg(_(" -n No swap file, use memory only\n")); mch_msg(_(" -r, -L List swap files and exit\n")); mch_msg(_(" -r <file> Recover crashed session\n")); - mch_msg(_(" -u <nvimrc> Use <nvimrc> instead of the default\n")); + mch_msg(_(" -u <vimrc> Use <vimrc> instead of the default\n")); mch_msg(_(" -i <shada> Use <shada> instead of the default\n")); mch_msg(_(" --noplugin Don't load plugin scripts\n")); mch_msg(_(" -o[N] Open N windows (default: one for each file)\n")); @@ -1842,7 +1842,7 @@ static void usage(void) mch_msg(_(" + Start at end of file\n")); mch_msg(_(" +<linenum> Start at line <linenum>\n")); mch_msg(_(" +/<pattern> Start at first occurrence of <pattern>\n")); - mch_msg(_(" --cmd <command> Execute <command> before loading any nvimrc\n")); + mch_msg(_(" --cmd <command> Execute <command> before loading any vimrc\n")); mch_msg(_(" -c <command> Execute <command> after loading the first file\n")); mch_msg(_(" -S <session> Source <session> after loading the first file\n")); mch_msg(_(" -s <scriptin> Read Normal mode commands from <scriptin>\n")); |