diff options
| -rw-r--r-- | src/mbyte.c | 2 | ||||
| -rw-r--r-- | src/ui.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/mbyte.c b/src/mbyte.c index e0b249862..68c1e941d 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -4108,7 +4108,7 @@ encname2codepage(name) p += 6; if (p[0] == 'c' && p[1] == 'p') - cp = atoi(p + 2); + cp = atoi((char *)p + 2); else if ((idx = enc_canon_search(p)) >= 0) cp = enc_canon_table[idx].codepage; else @@ -18,6 +18,12 @@ #include "vim.h" +#ifdef FEAT_CYGWIN_WIN32_CLIPBOARD +# define WIN32_LEAN_AND_MEAN +# include <windows.h> +# include "winclip.pro" +#endif + void ui_write(s, len) char_u *s; diff --git a/src/version.c b/src/version.c index e63af1f74..98b64d1b5 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1311, +/**/ 1310, /**/ 1309, |