From: Bram Moolenaar Date: Mon, 4 May 2015 07:31:11 +0000 (+0200) Subject: patch 7.4.713 X-Git-Tag: v7.4.713 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea98f8b4d6d2d2843b803f4c105cff1fe6fa0a90;p=thirdparty%2Fvim.git patch 7.4.713 Problem: Wrong condition for #ifdef. Solution: Change USR_EXRC_FILE2 to USR_VIMRC_FILE2. (Mikael Fourrier) --- 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 @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 713, /**/ 712, /**/