jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone

Blame SOURCES/7.4.388

073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.388
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.388
073263
Problem:    With 'linebreak' set and 'list' unset a Tab is not counted
073263
	    properly. (Kent Sibilev)
073263
Solution:   Check the 'list' option. (Christian Brabandt)
073263
Files:	    src/screen.c, src/testdir/test_listlbr_utf8.in,
073263
	    src/testdir/test_listlbr_utf8.ok
073263
073263
073263
*** ../vim-7.4.387/src/screen.c	2014-07-16 17:29:46.691536252 +0200
073263
--- src/screen.c	2014-07-30 16:41:15.167536033 +0200
073263
***************
073263
*** 4494,4500 ****
073263
  		    tab_len = (int)wp->w_buffer->b_p_ts
073263
  					- vcol % (int)wp->w_buffer->b_p_ts - 1;
073263
  #ifdef FEAT_LINEBREAK
073263
! 		    if (!wp->w_p_lbr)
073263
  #endif
073263
  		    /* tab amount depends on current column */
073263
  			n_extra = tab_len;
073263
--- 4494,4500 ----
073263
  		    tab_len = (int)wp->w_buffer->b_p_ts
073263
  					- vcol % (int)wp->w_buffer->b_p_ts - 1;
073263
  #ifdef FEAT_LINEBREAK
073263
! 		    if (!wp->w_p_lbr || !wp->w_p_list)
073263
  #endif
073263
  		    /* tab amount depends on current column */
073263
  			n_extra = tab_len;
073263
*** ../vim-7.4.387/src/testdir/test_listlbr_utf8.in	2014-07-16 17:01:38.279570568 +0200
073263
--- src/testdir/test_listlbr_utf8.in	2014-07-30 16:37:26.703537675 +0200
073263
***************
073263
*** 30,40 ****
073263
--- 30,51 ----
073263
  :redraw!
073263
  :let line=ScreenChar(winwidth(0))
073263
  :call DoRecordScreen()
073263
+ :"
073263
  :let g:test ="Test 2: set nolinebreak list"
073263
  :set list nolinebreak
073263
  :redraw!
073263
  :let line=ScreenChar(winwidth(0))
073263
  :call DoRecordScreen()
073263
+ :"
073263
+ :let g:test ="Test 3: set linebreak nolist"
073263
+ :$put =\"\t*mask = nil;\"
073263
+ :$
073263
+ :norm! zt
073263
+ :set nolist linebreak
073263
+ :redraw!
073263
+ :let line=ScreenChar(winwidth(0))
073263
+ :call DoRecordScreen()
073263
+ :"
073263
  :%w! test.out
073263
  :qa!
073263
  ENDTEST
073263
*** ../vim-7.4.387/src/testdir/test_listlbr_utf8.ok	2014-07-16 17:01:38.279570568 +0200
073263
--- src/testdir/test_listlbr_utf8.ok	2014-07-30 16:40:17.043536451 +0200
073263
***************
073263
*** 12,14 ****
073263
--- 12,21 ----
073263
  +pqrstuvwxyz␣1060ABC
073263
  +DEFGHIJKLMNOPˑ¶    
073263
073263
+ 	*mask = nil;
073263
+ 
073263
+ Test 3: set linebreak nolist
073263
+     *mask = nil;    
073263
+ ~                   
073263
+ ~                   
073263
+ ~                   
073263
*** ../vim-7.4.387/src/version.c	2014-07-30 16:00:45.551553496 +0200
073263
--- src/version.c	2014-07-30 16:40:57.659536159 +0200
073263
***************
073263
*** 736,737 ****
073263
--- 736,739 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     388,
073263
  /**/
073263
073263
-- 
073263
You can test a person's importance in the organization by asking how much RAM
073263
his computer has.  Anybody who knows the answer to that question is not a
073263
decision-maker.
073263
				(Scott Adams - The Dilbert principle)
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    ///