Blame SOURCES/7.4.303

22c937
To: vim_dev@googlegroups.com
22c937
Subject: Patch 7.4.303
22c937
Fcc: outbox
22c937
From: Bram Moolenaar <Bram@moolenaar.net>
22c937
Mime-Version: 1.0
22c937
Content-Type: text/plain; charset=UTF-8
22c937
Content-Transfer-Encoding: 8bit
22c937
------------
22c937
22c937
Patch 7.4.303
22c937
Problem:    When using double-width characters the text displayed on the
22c937
	    command line is sometimes truncated.
22c937
Solution:   Reset the string lenght. (Nobuhiro Takasaki)
22c937
Files:	    src/screen.c
22c937
22c937
22c937
*** ../vim-7.4.302/src/screen.c	2014-05-22 15:51:00.734399594 +0200
22c937
--- src/screen.c	2014-05-22 16:02:24.294385701 +0200
22c937
***************
22c937
*** 6916,6930 ****
22c937
   * a NUL.
22c937
   */
22c937
      void
22c937
! screen_puts_len(text, len, row, col, attr)
22c937
      char_u	*text;
22c937
!     int		len;
22c937
      int		row;
22c937
      int		col;
22c937
      int		attr;
22c937
  {
22c937
      unsigned	off;
22c937
      char_u	*ptr = text;
22c937
      int		c;
22c937
  #ifdef FEAT_MBYTE
22c937
      unsigned	max_off;
22c937
--- 6916,6931 ----
22c937
   * a NUL.
22c937
   */
22c937
      void
22c937
! screen_puts_len(text, textlen, row, col, attr)
22c937
      char_u	*text;
22c937
!     int		textlen;
22c937
      int		row;
22c937
      int		col;
22c937
      int		attr;
22c937
  {
22c937
      unsigned	off;
22c937
      char_u	*ptr = text;
22c937
+     int		len = textlen;
22c937
      int		c;
22c937
  #ifdef FEAT_MBYTE
22c937
      unsigned	max_off;
22c937
***************
22c937
*** 7169,7175 ****
22c937
--- 7170,7180 ----
22c937
  	    col += mbyte_cells;
22c937
  	    ptr += mbyte_blen;
22c937
  	    if (clear_next_cell)
22c937
+ 	    {
22c937
+ 		/* This only happens at the end, display one space next. */
22c937
  		ptr = (char_u *)" ";
22c937
+ 		len = -1;
22c937
+ 	    }
22c937
  	}
22c937
  	else
22c937
  #endif
22c937
*** ../vim-7.4.302/src/version.c	2014-05-22 15:51:00.738399594 +0200
22c937
--- src/version.c	2014-05-22 15:58:15.050390766 +0200
22c937
***************
22c937
*** 736,737 ****
22c937
--- 736,739 ----
22c937
  {   /* Add new patch number below this line */
22c937
+ /**/
22c937
+     303,
22c937
  /**/
22c937
22c937
-- 
22c937
hundred-and-one symptoms of being an internet addict:
22c937
193. You ask your girlfriend to drive home so you can sit back with
22c937
     your PDA and download the information to your laptop
22c937
22c937
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
22c937
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
22c937
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
22c937
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///