diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-02-26 14:56:42 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-02-26 14:56:42 +0100 |
| commit | 693e40c2cdb65f19febde5664633ac465931cc63 (patch) | |
| tree | 3c4ece28adb6806f3809f954ea134cd759b54ee5 /src/mbyte.c | |
| parent | 53eb37e9f9dfba51092f72553d79d3bb677a336b (diff) | |
| download | vim-git-693e40c2cdb65f19febde5664633ac465931cc63.tar.gz | |
updated for version 7.3.836v7.3.836
Problem: Clipboard does not work on Win32 when compiled with Cygwin.
Solution: Move the Win32 clipboard code to a separate file and use it when
building with os_unix.c. (Frodak Baksik, Ken Takata)
Diffstat (limited to 'src/mbyte.c')
| -rw-r--r-- | src/mbyte.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbyte.c b/src/mbyte.c index fe12c57d4..ed12e7603 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -613,7 +613,7 @@ codepage_invalid: enc_dbcs = enc_dbcs_new; has_mbyte = (enc_dbcs != 0 || enc_utf8); -#ifdef WIN3264 +#if defined(WIN3264) || defined(FEAT_CYGWIN_WIN32_CLIPBOARD) enc_codepage = encname2codepage(p_enc); enc_latin9 = (STRCMP(p_enc, "iso-8859-15") == 0); #endif @@ -4089,7 +4089,7 @@ enc_locale() return enc_canonize((char_u *)buf); } -#if defined(WIN3264) || defined(PROTO) +#if defined(WIN3264) || defined(PROTO) || defined(FEAT_CYGWIN_WIN32_CLIPBOARD) /* * Convert an encoding name to an MS-Windows codepage. * Returns zero if no codepage can be figured out. |