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