jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone
3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.388
3ef2ca
Fcc: outbox
3ef2ca
From: Bram Moolenaar <Bram@moolenaar.net>
3ef2ca
Mime-Version: 1.0
3ef2ca
Content-Type: text/plain; charset=UTF-8
3ef2ca
Content-Transfer-Encoding: 8bit
3ef2ca
------------
3ef2ca
3ef2ca
Patch 7.4.388
3ef2ca
Problem:    With 'linebreak' set and 'list' unset a Tab is not counted
3ef2ca
	    properly. (Kent Sibilev)
3ef2ca
Solution:   Check the 'list' option. (Christian Brabandt)
3ef2ca
Files:	    src/screen.c, src/testdir/test_listlbr_utf8.in,
3ef2ca
	    src/testdir/test_listlbr_utf8.ok
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.387/src/screen.c	2014-07-16 17:29:46.691536252 +0200
3ef2ca
--- src/screen.c	2014-07-30 16:41:15.167536033 +0200
3ef2ca
***************
3ef2ca
*** 4494,4500 ****
3ef2ca
  		    tab_len = (int)wp->w_buffer->b_p_ts
3ef2ca
  					- vcol % (int)wp->w_buffer->b_p_ts - 1;
3ef2ca
  #ifdef FEAT_LINEBREAK
3ef2ca
! 		    if (!wp->w_p_lbr)
3ef2ca
  #endif
3ef2ca
  		    /* tab amount depends on current column */
3ef2ca
  			n_extra = tab_len;
3ef2ca
--- 4494,4500 ----
3ef2ca
  		    tab_len = (int)wp->w_buffer->b_p_ts
3ef2ca
  					- vcol % (int)wp->w_buffer->b_p_ts - 1;
3ef2ca
  #ifdef FEAT_LINEBREAK
3ef2ca
! 		    if (!wp->w_p_lbr || !wp->w_p_list)
3ef2ca
  #endif
3ef2ca
  		    /* tab amount depends on current column */
3ef2ca
  			n_extra = tab_len;
3ef2ca
*** ../vim-7.4.387/src/testdir/test_listlbr_utf8.in	2014-07-16 17:01:38.279570568 +0200
3ef2ca
--- src/testdir/test_listlbr_utf8.in	2014-07-30 16:37:26.703537675 +0200
3ef2ca
***************
3ef2ca
*** 30,40 ****
3ef2ca
--- 30,51 ----
3ef2ca
  :redraw!
3ef2ca
  :let line=ScreenChar(winwidth(0))
3ef2ca
  :call DoRecordScreen()
3ef2ca
+ :"
3ef2ca
  :let g:test ="Test 2: set nolinebreak list"
3ef2ca
  :set list nolinebreak
3ef2ca
  :redraw!
3ef2ca
  :let line=ScreenChar(winwidth(0))
3ef2ca
  :call DoRecordScreen()
3ef2ca
+ :"
3ef2ca
+ :let g:test ="Test 3: set linebreak nolist"
3ef2ca
+ :$put =\"\t*mask = nil;\"
3ef2ca
+ :$
3ef2ca
+ :norm! zt
3ef2ca
+ :set nolist linebreak
3ef2ca
+ :redraw!
3ef2ca
+ :let line=ScreenChar(winwidth(0))
3ef2ca
+ :call DoRecordScreen()
3ef2ca
+ :"
3ef2ca
  :%w! test.out
3ef2ca
  :qa!
3ef2ca
  ENDTEST
3ef2ca
*** ../vim-7.4.387/src/testdir/test_listlbr_utf8.ok	2014-07-16 17:01:38.279570568 +0200
3ef2ca
--- src/testdir/test_listlbr_utf8.ok	2014-07-30 16:40:17.043536451 +0200
3ef2ca
***************
3ef2ca
*** 12,14 ****
3ef2ca
--- 12,21 ----
3ef2ca
  +pqrstuvwxyz␣1060ABC
3ef2ca
  +DEFGHIJKLMNOPˑ¶    
3ef2ca
3ef2ca
+ 	*mask = nil;
3ef2ca
+ 
3ef2ca
+ Test 3: set linebreak nolist
3ef2ca
+     *mask = nil;    
3ef2ca
+ ~                   
3ef2ca
+ ~                   
3ef2ca
+ ~                   
3ef2ca
*** ../vim-7.4.387/src/version.c	2014-07-30 16:00:45.551553496 +0200
3ef2ca
--- src/version.c	2014-07-30 16:40:57.659536159 +0200
3ef2ca
***************
3ef2ca
*** 736,737 ****
3ef2ca
--- 736,739 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     388,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
You can test a person's importance in the organization by asking how much RAM
3ef2ca
his computer has.  Anybody who knows the answer to that question is not a
3ef2ca
decision-maker.
3ef2ca
				(Scott Adams - The Dilbert principle)
3ef2ca
3ef2ca
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
3ef2ca
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
3ef2ca
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
3ef2ca
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///