updated for version 7.2-315

diff --git a/src/auto/configure b/src/auto/configure
index 7230ce3956d1647c69014ac736e5b45514870bf5..f7be0a777a79424e79e6e94df4779aa54061e6f6 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5126,7 +5126,7 @@ else
 
        vi_cv_path_python_conf=
        for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
-         for subdir in lib share; do
+         for subdir in lib64 lib share; do
            d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
            if test -d "$d" && test -f "$d/config.c"; then
              vi_cv_path_python_conf="$d"
@@ -13718,8 +13718,8 @@ $as_echo "$ac_try_echo") >&5
 $as_echo "pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&6; }
       else
        vim_cv_tty_group=world
-       { $as_echo "$as_me:$LINENO: result: ptys are world accessable" >&5
-$as_echo "ptys are world accessable" >&6; }
+       { $as_echo "$as_me:$LINENO: result: ptys are world accessible" >&5
+$as_echo "ptys are world accessible" >&6; }
       fi
 
 else
@@ -13730,8 +13730,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 
       vim_cv_tty_group=world
-      { $as_echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessable" >&5
-$as_echo "can't determine - assume ptys are world accessable" >&6; }
+      { $as_echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessible" >&5
+$as_echo "can't determine - assume ptys are world accessible" >&6; }
 
 fi
 rm -rf conftest.dSYM

diff --git a/src/configure.in b/src/configure.in
index 727bfd1bb51a3a51f1b9219979ce1d1158065b6f..6e292c4c66a923490ddc97ad7634c962efbf585e 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -686,7 +686,7 @@ if test "$enable_pythoninterp" = "yes"; then
       [
        vi_cv_path_python_conf=
        for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
-         for subdir in lib share; do
+         for subdir in lib64 lib share; do
            d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
            if test -d "$d" && test -f "$d/config.c"; then
              vi_cv_path_python_conf="$d"
@@ -2557,11 +2557,11 @@ main()
        AC_MSG_RESULT([pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group])
       else
        vim_cv_tty_group=world
-       AC_MSG_RESULT([ptys are world accessable])
+       AC_MSG_RESULT([ptys are world accessible])
       fi
     ],[
       vim_cv_tty_group=world
-      AC_MSG_RESULT([can't determine - assume ptys are world accessable])
+      AC_MSG_RESULT([can't determine - assume ptys are world accessible])
     ],[
       AC_MSG_ERROR(cross-compiling: please set 'vim_cv_tty_group' and 'vim_cv_tty_mode')
     ])

diff --git a/src/version.c b/src/version.c
index 376a78a384b9774975ec2fbbbd22dc780adbd23e..874b163fd40b56d9a538df205f178081a588d320 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    315,
 /**/
     314,
 /**/