# HG changeset patch
# User vimboss
# Date 1259773113 0
# Node ID c58b9479e304ff055b0404d9d73a51da4e9bf7e5
# Parent  9cbe94fd5c8f1ca388ccd2be94f17caa33ef093d
updated for version 7.2-315

diff --git a/src/auto/configure b/src/auto/configure
--- 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 @@ eval ac_try_echo="\"\$as_me:$LINENO: $ac
 $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
--- a/src/configure.in
+++ b/src/configure.in
@@ -686,7 +686,7 @@ if test "$enable_pythoninterp" = "yes"; 
       [
 	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
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    315,
+/**/
     314,
 /**/
     313,