073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.303
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.303
073263
Problem:    When using double-width characters the text displayed on the
073263
	    command line is sometimes truncated.
073263
Solution:   Reset the string lenght. (Nobuhiro Takasaki)
073263
Files:	    src/screen.c
073263
073263
073263
*** ../vim-7.4.302/src/screen.c	2014-05-22 15:51:00.734399594 +0200
073263
--- src/screen.c	2014-05-22 16:02:24.294385701 +0200
073263
***************
073263
*** 6916,6930 ****
073263
   * a NUL.
073263
   */
073263
      void
073263
! screen_puts_len(text, len, row, col, attr)
073263
      char_u	*text;
073263
!     int		len;
073263
      int		row;
073263
      int		col;
073263
      int		attr;
073263
  {
073263
      unsigned	off;
073263
      char_u	*ptr = text;
073263
      int		c;
073263
  #ifdef FEAT_MBYTE
073263
      unsigned	max_off;
073263
--- 6916,6931 ----
073263
   * a NUL.
073263
   */
073263
      void
073263
! screen_puts_len(text, textlen, row, col, attr)
073263
      char_u	*text;
073263
!     int		textlen;
073263
      int		row;
073263
      int		col;
073263
      int		attr;
073263
  {
073263
      unsigned	off;
073263
      char_u	*ptr = text;
073263
+     int		len = textlen;
073263
      int		c;
073263
  #ifdef FEAT_MBYTE
073263
      unsigned	max_off;
073263
***************
073263
*** 7169,7175 ****
073263
--- 7170,7180 ----
073263
  	    col += mbyte_cells;
073263
  	    ptr += mbyte_blen;
073263
  	    if (clear_next_cell)
073263
+ 	    {
073263
+ 		/* This only happens at the end, display one space next. */
073263
  		ptr = (char_u *)" ";
073263
+ 		len = -1;
073263
+ 	    }
073263
  	}
073263
  	else
073263
  #endif
073263
*** ../vim-7.4.302/src/version.c	2014-05-22 15:51:00.738399594 +0200
073263
--- src/version.c	2014-05-22 15:58:15.050390766 +0200
073263
***************
073263
*** 736,737 ****
073263
--- 736,739 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     303,
073263
  /**/
073263
073263
-- 
073263
hundred-and-one symptoms of being an internet addict:
073263
193. You ask your girlfriend to drive home so you can sit back with
073263
     your PDA and download the information to your laptop
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    ///