mirror of
https://github.com/vim/vim.git
synced 2025-09-26 04:04:07 -04:00
patch 7.4.976
Problem: When compiling Vim for MSYS2 (linked with msys-2.0.dll), the Win32 clipboard is not enabled. Solution: Recognize MSYS like CYGWIN. (Ken Takata)
This commit is contained in:
6
src/auto/configure
vendored
6
src/auto/configure
vendored
@@ -9501,10 +9501,10 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN environment" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN or MSYS environment" >&5
|
||||||
$as_echo_n "checking for CYGWIN environment... " >&6; }
|
$as_echo_n "checking for CYGWIN or MSYS environment... " >&6; }
|
||||||
case `uname` in
|
case `uname` in
|
||||||
CYGWIN*) CYGWIN=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
CYGWIN*|MSYS*) CYGWIN=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||||
$as_echo "yes" >&6; }
|
$as_echo "yes" >&6; }
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN clipboard support" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN clipboard support" >&5
|
||||||
$as_echo_n "checking for CYGWIN clipboard support... " >&6; }
|
$as_echo_n "checking for CYGWIN clipboard support... " >&6; }
|
||||||
|
@@ -2792,9 +2792,9 @@ dnl end of GUI-checking
|
|||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
|
|
||||||
dnl Check for Cygwin, which needs an extra source file if not using X11
|
dnl Check for Cygwin, which needs an extra source file if not using X11
|
||||||
AC_MSG_CHECKING(for CYGWIN environment)
|
AC_MSG_CHECKING(for CYGWIN or MSYS environment)
|
||||||
case `uname` in
|
case `uname` in
|
||||||
CYGWIN*) CYGWIN=yes; AC_MSG_RESULT(yes)
|
CYGWIN*|MSYS*) CYGWIN=yes; AC_MSG_RESULT(yes)
|
||||||
AC_MSG_CHECKING(for CYGWIN clipboard support)
|
AC_MSG_CHECKING(for CYGWIN clipboard support)
|
||||||
if test "x$with_x" = "xno" ; then
|
if test "x$with_x" = "xno" ; then
|
||||||
OS_EXTRA_SRC=winclip.c; OS_EXTRA_OBJ=objects/winclip.o
|
OS_EXTRA_SRC=winclip.c; OS_EXTRA_OBJ=objects/winclip.o
|
||||||
|
@@ -741,6 +741,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 */
|
||||||
|
/**/
|
||||||
|
976,
|
||||||
/**/
|
/**/
|
||||||
975,
|
975,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user