Mercurial > vim

changeset 5956:a076237d1c38 v7.4.319

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@vim.org>
date Thu, 12 Jun 2014 13:28:30 +0200
parents 72c6378384f2
children c4d8afa9f89c
files src/ui.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ui.c
+++ b/src/ui.c
@@ -2324,7 +2324,7 @@ clip_x11_convert_selection_cb(w, sel_ato
     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
--- 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,