mirror of
https://github.com/vim/vim.git
synced 2025-10-13 06:54:15 -04:00
updated for version 7.2-315
This commit is contained in:
10
src/auto/configure
vendored
10
src/auto/configure
vendored
@@ -5126,7 +5126,7 @@ else
|
|||||||
|
|
||||||
vi_cv_path_python_conf=
|
vi_cv_path_python_conf=
|
||||||
for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
|
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"
|
d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
|
||||||
if test -d "$d" && test -f "$d/config.c"; then
|
if test -d "$d" && test -f "$d/config.c"; then
|
||||||
vi_cv_path_python_conf="$d"
|
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; }
|
$as_echo "pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&6; }
|
||||||
else
|
else
|
||||||
vim_cv_tty_group=world
|
vim_cv_tty_group=world
|
||||||
{ $as_echo "$as_me:$LINENO: result: ptys are world accessable" >&5
|
{ $as_echo "$as_me:$LINENO: result: ptys are world accessible" >&5
|
||||||
$as_echo "ptys are world accessable" >&6; }
|
$as_echo "ptys are world accessible" >&6; }
|
||||||
fi
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
@@ -13730,8 +13730,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
|||||||
( exit $ac_status )
|
( exit $ac_status )
|
||||||
|
|
||||||
vim_cv_tty_group=world
|
vim_cv_tty_group=world
|
||||||
{ $as_echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessable" >&5
|
{ $as_echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessible" >&5
|
||||||
$as_echo "can't determine - assume ptys are world accessable" >&6; }
|
$as_echo "can't determine - assume ptys are world accessible" >&6; }
|
||||||
|
|
||||||
fi
|
fi
|
||||||
rm -rf conftest.dSYM
|
rm -rf conftest.dSYM
|
||||||
|
@@ -686,7 +686,7 @@ if test "$enable_pythoninterp" = "yes"; then
|
|||||||
[
|
[
|
||||||
vi_cv_path_python_conf=
|
vi_cv_path_python_conf=
|
||||||
for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
|
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"
|
d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
|
||||||
if test -d "$d" && test -f "$d/config.c"; then
|
if test -d "$d" && test -f "$d/config.c"; then
|
||||||
vi_cv_path_python_conf="$d"
|
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])
|
AC_MSG_RESULT([pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group])
|
||||||
else
|
else
|
||||||
vim_cv_tty_group=world
|
vim_cv_tty_group=world
|
||||||
AC_MSG_RESULT([ptys are world accessable])
|
AC_MSG_RESULT([ptys are world accessible])
|
||||||
fi
|
fi
|
||||||
],[
|
],[
|
||||||
vim_cv_tty_group=world
|
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')
|
AC_MSG_ERROR(cross-compiling: please set 'vim_cv_tty_group' and 'vim_cv_tty_mode')
|
||||||
])
|
])
|
||||||
|
@@ -681,6 +681,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
315,
|
||||||
/**/
|
/**/
|
||||||
314,
|
314,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user