Merge #2832 'Mark NA patches; vim-patch:7.4.713'

2 files changed, 22 insertions, 13 deletions

diff --git a/src/nvim/os_unix_defs.h b/src/nvim/os_unix_defs.h
index 24b069b090..c66a81447c 100644
--- a/src/nvim/os_unix_defs.h
+++ b/src/nvim/os_unix_defs.h
@@ -117,7 +117,7 @@
 #endif
 
 
-#if !defined(USR_EXRC_FILE2)
+#if !defined(USR_VIMRC_FILE2)
 #    define USR_VIMRC_FILE2     "~/.nvim/nvimrc"
 #endif
 
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 432b0130bc..2ebc080eb8 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -71,6 +71,15 @@ static char *features[] = {
 
 // clang-format off
 static int included_patches[] = {
+  //738 NA
+  //737,
+  //736,
+  //735,
+  //734,
+  //733,
+  //732,
+  //731 NA
+  //730 NA
   //729,
   //728 NA
   //727 NA
@@ -87,7 +96,7 @@ static int included_patches[] = {
   //716,
   //715,
   //714,
-  //713,
+  713,
   712,
   711,
   710,
@@ -97,7 +106,7 @@ static int included_patches[] = {
   706,
   //705 NA
   //704,
-  //703,
+  //703 NA
   702,
   //701 NA
   //700,
@@ -108,21 +117,21 @@ static int included_patches[] = {
   695,
   //694,
   //693,
-  //692,
-  //691,
+  //692 NA
+  //691 NA
   690,
   //689,
   //688,
-  //687,
+  //687 NA
   //686,
   //685,
   //684,
-  //683,
+  //683 NA
   //682,
   //681 NA
   //680,
   //679 NA
-  //678,
+  //678 NA
   //677 NA
   //676 NA
   //675,
@@ -134,9 +143,9 @@ static int included_patches[] = {
   //669 NA
   //668,
   //667,
-  //666,
+  //666 NA
   //665,
-  //664,
+  //664 NA
   //663 NA
   //662,
   //661,
@@ -156,7 +165,7 @@ static int included_patches[] = {
   //647 NA
   //646,
   //645,
-  //644,
+  //644 NA
   //643,
   //642,
   //641,
@@ -173,7 +182,7 @@ static int included_patches[] = {
   630,
   629,
   //628,
-  //627,
+  //627 NA
   //626 NA
   //625 NA
   //624,
@@ -189,7 +198,7 @@ static int included_patches[] = {
   //614,
   //613,
   //612,
-  //611,
+  //611 NA
   //610 NA
   //609,
   //608,