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