From 980e58f7b324980d40ce690506897d138e5e2b70 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 12 Jun 2014 13:28:30 +0200
Subject: 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)

---
 src/ui.c      | 2 +-
 src/version.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ui.c b/src/ui.c
index fc91de655..570b84848 100644
--- 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 00948fd97..335f9dea4 100644
--- 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,
 /**/
-- 
cgit v1.2.1