Skip to content

Commit 8def26a

Browse files
committed
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)
1 parent 75e3ad0 commit 8def26a

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

src/auto/configure

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9501,10 +9501,10 @@ fi
95019501

95029502

95039503

9504-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN environment" >&5
9505-
$as_echo_n "checking for CYGWIN environment... " >&6; }
9504+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN or MSYS environment" >&5
9505+
$as_echo_n "checking for CYGWIN or MSYS environment... " >&6; }
95069506
case `uname` in
9507-
CYGWIN*) CYGWIN=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
9507+
CYGWIN*|MSYS*) CYGWIN=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
95089508
$as_echo "yes" >&6; }
95099509
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN clipboard support" >&5
95109510
$as_echo_n "checking for CYGWIN clipboard support... " >&6; }

src/configure.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2792,9 +2792,9 @@ dnl end of GUI-checking
27922792
dnl ---------------------------------------------------------------------------
27932793

27942794
dnl Check for Cygwin, which needs an extra source file if not using X11
2795-
AC_MSG_CHECKING(for CYGWIN environment)
2795+
AC_MSG_CHECKING(for CYGWIN or MSYS environment)
27962796
case `uname` in
2797-
CYGWIN*) CYGWIN=yes; AC_MSG_RESULT(yes)
2797+
CYGWIN*|MSYS*) CYGWIN=yes; AC_MSG_RESULT(yes)
27982798
AC_MSG_CHECKING(for CYGWIN clipboard support)
27992799
if test "x$with_x" = "xno" ; then
28002800
OS_EXTRA_SRC=winclip.c; OS_EXTRA_OBJ=objects/winclip.o

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ static char *(features[]) =
741741

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
976,
744746
/**/
745747
975,
746748
/**/

0 commit comments

Comments
 (0)