From 1d4e48326546bbd360f74641458a210585d3bfca Mon Sep 17 00:00:00 2001
From: Felipe Morales <hel.sheep@gmail.com>
Date: Fri, 12 Jun 2015 02:30:10 -0300
Subject: version.c: Update patches list

These patches are not applicable (NA):
  .611 (if_python3.c)
  .627 (term.c)
  .666 (X on *nix)
  .678 (--remote)
  .683 (vimtutor)
  .687 (terminal)
  .691 (mzscheme)
  .692 (Solaris)
  .730 (crypto)
  .731 (GUI)
  .738 (compiling w/o syntax highlighting)

  .644 applied in an unsupported platform (Stratus VOS)
---
 src/nvim/version.c | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 432b0130bc..6141f82cfb 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
@@ -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,7 +143,7 @@ static int included_patches[] = {
   //669 NA
   //668,
   //667,
-  //666,
+  //666 NA
   //665,
   //664,
   //663 NA
@@ -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,
-- 
cgit 


From 3af79d552ac9d0cc6e5fc54eb08b4503e7072900 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 13 Jun 2015 12:41:40 -0400
Subject: version.c: mark NA: 664, 703

---
 src/nvim/version.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 6141f82cfb..a2f6ddf4b6 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -106,7 +106,7 @@ static int included_patches[] = {
   706,
   //705 NA
   //704,
-  //703,
+  //703 NA
   702,
   //701 NA
   //700,
@@ -145,7 +145,7 @@ static int included_patches[] = {
   //667,
   //666 NA
   //665,
-  //664,
+  //664 NA
   //663 NA
   //662,
   //661,
-- 
cgit 


From dfdf045b180489b9c92730f921e6a5412932c61c Mon Sep 17 00:00:00 2001
From: Felipe Morales <hel.sheep@gmail.com>
Date: Fri, 12 Jun 2015 02:31:08 -0300
Subject: vim-patch:7.4.713

patch 7.4.713
Problem:    Wrong condition for #ifdef.
Solution:   Change USR_EXRC_FILE2 to USR_VIMRC_FILE2. (Mikael Fourrier)

https://code.google.com/p/vim/source/detail?r=v7-4-713
---
 src/nvim/os_unix_defs.h | 2 +-
 src/nvim/version.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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 a2f6ddf4b6..2ebc080eb8 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -96,7 +96,7 @@ static int included_patches[] = {
   //716,
   //715,
   //714,
-  //713,
+  713,
   712,
   711,
   710,
-- 
cgit