diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-05-04 09:31:11 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-05-04 09:31:11 +0200 |
| commit | ea98f8b4d6d2d2843b803f4c105cff1fe6fa0a90 (patch) | |
| tree | a89a3bd01916a0ca52a81664a101661db1291a89 | |
| parent | 1510f996c53243e5fe65a773087a1fa14879f503 (diff) | |
patch 7.4.713v7.4.713
Problem: Wrong condition for #ifdef.
Solution: Change USR_EXRC_FILE2 to USR_VIMRC_FILE2. (Mikael Fourrier)
| -rw-r--r-- | src/os_unix.h | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/os_unix.h b/src/os_unix.h index 4220534b93..5fc95eee0a 100644 --- a/src/os_unix.h +++ b/src/os_unix.h @@ -290,7 +290,7 @@ typedef struct dsc$descriptor DESC; #endif -#if !defined(USR_EXRC_FILE2) +#if !defined(USR_VIMRC_FILE2) # ifdef OS2 # define USR_VIMRC_FILE2 "$HOME/vimfiles/vimrc" # else diff --git a/src/version.c b/src/version.c index 235dd24051..4097dac092 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 713, +/**/ 712, /**/ 711, |