diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-06-12 13:28:30 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-06-12 13:28:30 +0200 |
| commit | 980e58f7b324980d40ce690506897d138e5e2b70 (patch) | |
| tree | 7d8e115ce9e1af5395ff1a3c1887f333f7056d1d | |
| parent | e3a8bab6304117b5c341171299472e1a00e70c85 (diff) | |
| download | vim-git-7.4.319.tar.gz | |
updated for version 7.4.319v7.4.319
Problem: Crash when putting zero bytes on the clipboard.
Solution: Do not support the utf8_atom target when not using an Unicode
encoding. (Naofumi Honda)
| -rw-r--r-- | src/ui.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -2324,7 +2324,7 @@ clip_x11_convert_selection_cb(w, sel_atom, target, type, value, length, format) if ( *target != XA_STRING #ifdef FEAT_MBYTE && *target != vimenc_atom - && *target != utf8_atom + && (*target != utf8_atom || !enc_utf8) #endif && *target != vim_atom && *target != text_atom diff --git a/src/version.c b/src/version.c index 00948fd97..335f9dea4 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 319, +/**/ 318, /**/ 317, |