Commits

Ken Takata committed b2d7104

update for 7.3.815

Remove patches which are already merged.

  • Participants
  • Parent commits 12cb6ca

Comments (0)

Files changed (5)

0001-support-mingw-w64.patch

-# HG changeset patch
-# Parent 8244a397313b7ec2b1ea4e1b383439c7395ac8f2
-
-diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
---- a/src/Make_cyg.mak
-+++ b/src/Make_cyg.mak
-@@ -226,6 +226,10 @@
- endif
- 
- DEFINES += -DFEAT_RUBY
-+ifneq ($(findstring w64-mingw32,$(CC)),)
-+# A workaround for mingw-w64
-+DEFINES += -DHAVE_STRUCT_TIMESPEC -DHAVE_STRUCT_TIMEZONE
-+endif
- INCLUDES += -I$(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM)
- ifdef RUBY_19_OR_LATER
- INCLUDES += -I$(RUBY)/include/ruby-$(RUBY_VER_LONG) -I$(RUBY)/include/ruby-$(RUBY_VER_LONG)/$(RUBY_PLATFORM)

0002-set-RUBY_INSTALL_NAME-and-RUBY_PLATFORM.patch

-# HG changeset patch
-# Parent 12e327f895c2ed1ecc0072b3c82dd01875d3bde1
-
-diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
---- a/src/Make_cyg.mak
-+++ b/src/Make_cyg.mak
-@@ -193,31 +193,37 @@
- ##############################
- ifdef RUBY
- 
-+ifndef DYNAMIC_RUBY
-+DYNAMIC_RUBY=yes
-+endif
-+#  Set default value
- ifndef RUBY_VER
--RUBY_VER=16
-+RUBY_VER = 16
-+endif
-+ifndef RUBY_VER_LONG
-+RUBY_VER_LONG = 1.6
-+endif
-+ifndef RUBY_API_VER
-+RUBY_API_VER = $(subst .,,$(RUBY_VER_LONG))
- endif
- 
--ifndef RUBY_VER_LONG
--RUBY_VER_LONG=1.6
-+ifndef RUBY_PLATFORM
-+ifeq ($(RUBY_VER), 16)
-+RUBY_PLATFORM = i586-mswin32
-+else
-+ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32),)
-+RUBY_PLATFORM = i386-mingw32
-+else
-+RUBY_PLATFORM = i386-mswin32
-+endif
-+endif
- endif
- 
--ifndef DYNAMIC_RUBY
--DYNAMIC_RUBY = yes
--endif
--
-+ifndef RUBY_INSTALL_NAME
- ifeq ($(RUBY_VER), 16)
--ifndef RUBY_PLATFORM
--RUBY_PLATFORM = i586-mswin32
--endif
--ifndef RUBY_INSTALL_NAME
--RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
--endif
-+RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER)
- else
--ifndef RUBY_PLATFORM
--RUBY_PLATFORM = i386-mswin32
--endif
--ifndef RUBY_INSTALL_NAME
--RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER)
-+RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_API_VER)
- endif
- endif
- 

0003-use-mingw-gcc-as-default.patch

-# HG changeset patch
-# Parent 637e7976fe628e55d944d51c11b31ca1996ac97e
-
-diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
---- a/src/Make_cyg.mak
-+++ b/src/Make_cyg.mak
-@@ -47,8 +47,8 @@
- #               (i386)
- # USEDLL	no or yes: set to yes to use the Runtime library DLL (no)
- #		For USEDLL=yes the cygwin1.dll is required to run Vim.
--#		"no" does not work with latest version of Cygwin, use
--#		Make_ming.mak instead.  Or set CC to gcc-3 and add
-+#		For "no" the mingw-gcc-g++ package or the mingw64-i686-gcc-g++
-+#		package is required to complie Vim.  Or set CC to gcc-3 and add
- #		-L/lib/w32api to EXTRA_LIBS.
- # POSTSCRIPT	no or yes: set to yes for PostScript printing (no)
- # FEATURES	TINY, SMALL, NORMAL, BIG or HUGE (BIG)
-@@ -114,9 +114,17 @@
- INCLUDES = -march=$(ARCH) -Iproto
- 
- #>>>>> name of the compiler and linker, name of lib directory
--CROSS_COMPILE =
-+ifeq (yes, $(USEDLL))
-+# CROSS_COMPILE is used for the gvimext DLL.
-+CROSS_COMPILE = i686-pc-mingw32-
- CC = gcc
- RC = windres
-+else
-+# i686-pc-mingw32-gcc, i686-w64-mingw32-gcc or gcc-3 can be used.
-+CROSS_COMPILE = i686-pc-mingw32-
-+CC = $(CROSS_COMPILE)gcc
-+RC = $(CROSS_COMPILE)windres
-+endif
- 
- ##############################
- # DYNAMIC_PERL=yes and no both work

fix-win32console-mbyte-input.patch

-# HG changeset patch
-# Parent 04592728474a35794ae6397a0b90f2989864fb66
-
-diff --git a/src/mbyte.c b/src/mbyte.c
---- a/src/mbyte.c
-+++ b/src/mbyte.c
-@@ -6205,8 +6205,23 @@
- 	    if (vcp->vc_cpfrom == 0)
- 		tmp_len = utf8_to_utf16(ptr, len, NULL, NULL);
- 	    else
--		tmp_len = MultiByteToWideChar(vcp->vc_cpfrom, 0,
--							      ptr, len, 0, 0);
-+	    {
-+		tmp_len = MultiByteToWideChar(vcp->vc_cpfrom,
-+					unconvlenp ? MB_ERR_INVALID_CHARS : 0,
-+					ptr, len, 0, 0);
-+		if (tmp_len == 0 &&
-+			GetLastError() == ERROR_NO_UNICODE_TRANSLATION)
-+		{
-+		    if (lenp != NULL)
-+			*lenp = 0;
-+		    if (unconvlenp != NULL)
-+			*unconvlenp = len;
-+		    retval = alloc(1);
-+		    if (retval)
-+			retval[0] = NUL;
-+		    return retval;
-+		}
-+	    }
- 	    tmp = (short_u *)alloc(sizeof(short_u) * tmp_len);
- 	    if (tmp == NULL)
- 		break;
-diff --git a/src/os_win32.c b/src/os_win32.c
---- a/src/os_win32.c
-+++ b/src/os_win32.c
-@@ -1431,6 +1431,11 @@
- #define TYPEAHEADLEN 20
-     static char_u   typeahead[TYPEAHEADLEN];	/* previously typed bytes. */
-     static int	    typeaheadlen = 0;
-+#ifdef FEAT_MBYTE
-+    static char_u *rest = NULL;	    /* unconverted rest of previous read */
-+    static int	restlen = 0;
-+    int		unconverted;
-+#endif
- 
-     /* First use any typeahead that was kept because "buf" was too small. */
-     if (typeaheadlen > 0)
-@@ -1534,6 +1539,33 @@
- 
- 	    c = tgetch(&modifiers, &ch2);
- 
-+# ifdef FEAT_MBYTE
-+	    /* stolen from fill_input_buf() in ui.c */
-+	    if (rest != NULL)
-+	    {
-+		/* Use remainder of previous call, starts with an invalid
-+		 * character that may become valid when reading more. */
-+		if (restlen > TYPEAHEADLEN - typeaheadlen)
-+		    unconverted = TYPEAHEADLEN - typeaheadlen;
-+		else
-+		    unconverted = restlen;
-+		mch_memmove(typeahead + typeaheadlen, rest, unconverted);
-+		if (unconverted == restlen)
-+		{
-+		    vim_free(rest);
-+		    rest = NULL;
-+		}
-+		else
-+		{
-+		    restlen -= unconverted;
-+		    mch_memmove(rest, rest + unconverted, restlen);
-+		}
-+		typeaheadlen += unconverted;
-+	    }
-+	    else
-+		unconverted = 0;
-+#endif
-+
- 	    if (typebuf_changed(tb_change_cnt))
- 	    {
- 		/* "buf" may be invalid now if a client put something in the
-@@ -1569,8 +1601,12 @@
- 		 * when 'tenc' is set. */
- 		if (input_conv.vc_type != CONV_NONE
- 						&& (ch2 == NUL || c != K_NUL))
--		    n = convert_input(typeahead + typeaheadlen, n,
--						 TYPEAHEADLEN - typeaheadlen);
-+		{
-+		    typeaheadlen -= unconverted;
-+		    n = convert_input_safe(typeahead + typeaheadlen,
-+				n + unconverted, TYPEAHEADLEN - typeaheadlen,
-+				rest == NULL ? &rest : NULL, &restlen);
-+		}
- #endif
- 
- 		/* Use the ALT key to set the 8th bit of the character
 symlinkfix-update.diff
 acl-fix.patch
 acl-mingw.patch
-fix-win32console-mbyte-input.patch
 0009-kaoriya-ambiwidth-auto.patch
 0025-kaoriya-feat-kaoriya.patch
 support-alt-gettext-dll.patch
 version_acl_xpm.patch
-0001-support-mingw-w64.patch
-0002-set-RUBY_INSTALL_NAME-and-RUBY_PLATFORM.patch
-0003-use-mingw-gcc-as-default.patch
 patch-direct_write.diff
 patch-direct_write-ex1.diff
 use-proto.diff