4 files changed, 3 insertions, 28 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 48e0f48ea6..3c1d59567b 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -1834,12 +1834,8 @@ static void source_startup_scripts(mparm_T *parmp)
     // The first that exists is used, the rest is ignored.
     char_u *user_vimrc = (char_u *)stdpaths_user_conf_subpath("init.vim");
     if (process_env("VIMINIT", true) != OK) {
-      if (do_source(user_vimrc, true, DOSO_VIMRC) == FAIL
-          && process_env("EXINIT", false) == FAIL
-          && do_source((char_u *)USR_EXRC_FILE, false, DOSO_NONE) == FAIL) {
-#ifdef USR_EXRC_FILE2
-        (void)do_source((char_u *)USR_EXRC_FILE2, false, DOSO_NONE);
-#endif
+      if (do_source(user_vimrc, true, DOSO_VIMRC) == FAIL) {
+        process_env("EXINIT", false);
       }
     }
 
@@ -1877,14 +1873,7 @@ static void source_startup_scripts(mparm_T *parmp)
         else
           secure = 0;
 #endif
-        if (       path_full_compare((char_u *)USR_EXRC_FILE,
-              (char_u *)EXRC_FILE, FALSE) != kEqualFiles
-#ifdef USR_EXRC_FILE2
-            && path_full_compare((char_u *)USR_EXRC_FILE2,
-              (char_u *)EXRC_FILE, FALSE) != kEqualFiles
-#endif
-           )
-          (void)do_source((char_u *)EXRC_FILE, FALSE, DOSO_NONE);
+        (void) do_source((char_u *)EXRC_FILE, FALSE, DOSO_NONE);
       }
     }
     xfree(user_vimrc);
diff --git a/src/nvim/os/unix_defs.h b/src/nvim/os/unix_defs.h
index 82a434cdf1..e1c3060999 100644
--- a/src/nvim/os/unix_defs.h
+++ b/src/nvim/os/unix_defs.h
@@ -28,9 +28,6 @@
 #ifndef SYNTAX_FNAME
 # define SYNTAX_FNAME   "$VIMRUNTIME/syntax/%s.vim"
 #endif
-#ifndef USR_EXRC_FILE
-# define USR_EXRC_FILE "~/.exrc"
-#endif
 #ifndef EXRC_FILE
 # define EXRC_FILE      ".exrc"
 #endif
diff --git a/src/nvim/os/win_defs.h b/src/nvim/os/win_defs.h
index 585def7dd0..d614582250 100644
--- a/src/nvim/os/win_defs.h
+++ b/src/nvim/os/win_defs.h
@@ -7,7 +7,6 @@
 #define TEMP_FILE_PATH_MAXLEN _MAX_PATH
 
 // Defines needed to fix the build on Windows:
-// - USR_EXRC_FILE
 // - DFLT_DIR
 // - DFLT_BDIR
 // - DFLT_VDIR
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 9cfda96c16..3b80336817 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -1067,16 +1067,6 @@ void list_version(void)
   version_msg(SYS_VIMRC_FILE);
   version_msg("\"\n");
 #endif  // ifdef SYS_VIMRC_FILE
-#ifdef USR_EXRC_FILE
-  version_msg(_("      user exrc file: \""));
-  version_msg(USR_EXRC_FILE);
-  version_msg("\"\n");
-#endif  // ifdef USR_EXRC_FILE
-#ifdef USR_EXRC_FILE2
-  version_msg(_("  2nd user exrc file: \""));
-  version_msg(USR_EXRC_FILE2);
-  version_msg("\"\n");
-#endif  // ifdef USR_EXRC_FILE2
 #ifdef HAVE_PATHDEF
 
   if (*default_vim_dir != NUL) {