diff options
| author | Felipe Morales <hel.sheep@gmail.com> | 2015-06-12 02:31:08 -0300 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-06-13 12:43:28 -0400 |
| commit | dfdf045b180489b9c92730f921e6a5412932c61c (patch) | |
| tree | 2353916b87cb45c50f3a5f2bf0622d3f5de725eb /src | |
| parent | 3af79d552ac9d0cc6e5fc54eb08b4503e7072900 (diff) | |
| download | rneovim-dfdf045b180489b9c92730f921e6a5412932c61c.tar.gz rneovim-dfdf045b180489b9c92730f921e6a5412932c61c.tar.bz2 rneovim-dfdf045b180489b9c92730f921e6a5412932c61c.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/os_unix_defs.h | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 2 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 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, |