updated for version 7.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)

diff --git a/src/ui.c b/src/ui.c
index fc91de65557a44118dea6f2a46d4fd1f6300c855..570b8484897578b525f251565ffd9bc31fe53bd6 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -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 00948fd974e945604090f2e5a4c58873ecc3fa5d..335f9dea418a103767dfb4aba23076db168c02e9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    319,
 /**/
     318,
 /**/