jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone
073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.319
073263
Fcc: outbox
073263
From: Bram Moolenaar <Bram@moolenaar.net>
073263
Mime-Version: 1.0
073263
Content-Type: text/plain; charset=UTF-8
073263
Content-Transfer-Encoding: 8bit
073263
------------
073263
073263
Patch 7.4.319
073263
Problem:    Crash when putting zero bytes on the clipboard.
073263
Solution:   Do not support the utf8_atom target when not using an Unicode
073263
	    encoding. (Naofumi Honda)
073263
Files:	    src/ui.c
073263
073263
073263
*** ../vim-7.4.318/src/ui.c	2014-03-23 15:12:29.943264337 +0100
073263
--- src/ui.c	2014-06-12 13:25:21.791687853 +0200
073263
***************
073263
*** 2324,2330 ****
073263
      if (       *target != XA_STRING
073263
  #ifdef FEAT_MBYTE
073263
  	    && *target != vimenc_atom
073263
! 	    && *target != utf8_atom
073263
  #endif
073263
  	    && *target != vim_atom
073263
  	    && *target != text_atom
073263
--- 2324,2330 ----
073263
      if (       *target != XA_STRING
073263
  #ifdef FEAT_MBYTE
073263
  	    && *target != vimenc_atom
073263
! 	    && (*target != utf8_atom || !enc_utf8)
073263
  #endif
073263
  	    && *target != vim_atom
073263
  	    && *target != text_atom
073263
*** ../vim-7.4.318/src/version.c	2014-06-12 12:20:50.195541385 +0200
073263
--- src/version.c	2014-06-12 13:26:09.147689645 +0200
073263
***************
073263
*** 736,737 ****
073263
--- 736,739 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     319,
073263
  /**/
073263
073263
-- 
073263
FIRST HEAD:  Oh! quick! get the sword out I want to cut his head off.
073263
THIRD HEAD:  Oh, cut your own head off.
073263
SECOND HEAD: Yes - do us all a favour.
073263
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
073263
073263
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
073263
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
073263
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
073263
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///