|
 |
e393e44 |
To: vim_dev@googlegroups.com
|
|
|
e393e44 |
Subject: Patch 7.4.422
|
|
|
e393e44 |
Fcc: outbox
|
|
|
e393e44 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
e393e44 |
Mime-Version: 1.0
|
|
|
e393e44 |
Content-Type: text/plain; charset=UTF-8
|
|
|
e393e44 |
Content-Transfer-Encoding: 8bit
|
|
|
e393e44 |
------------
|
|
|
e393e44 |
|
|
|
e393e44 |
Patch 7.4.422
|
|
|
e393e44 |
Problem: When using conceal with linebreak some text is not displayed
|
|
|
e393e44 |
correctly. (GrĂ¼ner Gimpel)
|
|
|
e393e44 |
Solution: Check for conceal mode when using linebreak. (Christian Brabandt)
|
|
|
e393e44 |
Files: src/screen.c, src/testdir/test_listlbr.in,
|
|
|
e393e44 |
src/testdir/test_listlbr.ok
|
|
|
e393e44 |
|
|
|
e393e44 |
|
|
|
e393e44 |
*** ../vim-7.4.421/src/screen.c 2014-08-16 16:28:31.882272056 +0200
|
|
|
e393e44 |
--- src/screen.c 2014-08-29 12:08:11.478423596 +0200
|
|
|
e393e44 |
***************
|
|
|
e393e44 |
*** 4514,4519 ****
|
|
|
e393e44 |
--- 4514,4524 ----
|
|
|
e393e44 |
int i;
|
|
|
e393e44 |
int saved_nextra = n_extra;
|
|
|
e393e44 |
|
|
|
e393e44 |
+ #ifdef FEAT_CONCEAL
|
|
|
e393e44 |
+ if (is_concealing && vcol_off > 0)
|
|
|
e393e44 |
+ /* there are characters to conceal */
|
|
|
e393e44 |
+ tab_len += vcol_off;
|
|
|
e393e44 |
+ #endif
|
|
|
e393e44 |
/* if n_extra > 0, it gives the number of chars, to
|
|
|
e393e44 |
* use for a tab, else we need to calculate the width
|
|
|
e393e44 |
* for a tab */
|
|
|
e393e44 |
***************
|
|
|
e393e44 |
*** 4539,4544 ****
|
|
|
e393e44 |
--- 4544,4555 ----
|
|
|
e393e44 |
#endif
|
|
|
e393e44 |
}
|
|
|
e393e44 |
p_extra = p_extra_free;
|
|
|
e393e44 |
+ #ifdef FEAT_CONCEAL
|
|
|
e393e44 |
+ /* n_extra will be increased by FIX_FOX_BOGUSCOLS
|
|
|
e393e44 |
+ * macro below, so need to adjust for that here */
|
|
|
e393e44 |
+ if (is_concealing && vcol_off > 0)
|
|
|
e393e44 |
+ n_extra -= vcol_off;
|
|
|
e393e44 |
+ #endif
|
|
|
e393e44 |
}
|
|
|
e393e44 |
#endif
|
|
|
e393e44 |
#ifdef FEAT_CONCEAL
|
|
|
e393e44 |
*** ../vim-7.4.421/src/testdir/test_listlbr.in 2014-07-16 17:01:38.279570568 +0200
|
|
|
e393e44 |
--- src/testdir/test_listlbr.in 2014-08-29 12:03:48.126423021 +0200
|
|
|
e393e44 |
***************
|
|
|
e393e44 |
*** 46,51 ****
|
|
|
e393e44 |
--- 46,61 ----
|
|
|
e393e44 |
:redraw!
|
|
|
e393e44 |
:let line=ScreenChar(winwidth(0))
|
|
|
e393e44 |
:call DoRecordScreen()
|
|
|
e393e44 |
+ :let line="_S_\t bla"
|
|
|
e393e44 |
+ :$put =line
|
|
|
e393e44 |
+ :$
|
|
|
e393e44 |
+ :norm! zt
|
|
|
e393e44 |
+ :let g:test ="Test 5: set linebreak with conceal and set list and tab displayed by different char (line may not be truncated)"
|
|
|
e393e44 |
+ :set cpo&vim list linebreak conceallevel=2 concealcursor=nv listchars=tab:ab
|
|
|
e393e44 |
+ :syn match ConcealVar contained /_/ conceal
|
|
|
e393e44 |
+ :syn match All /.*/ contains=ConcealVar
|
|
|
e393e44 |
+ :let line=ScreenChar(winwidth(0))
|
|
|
e393e44 |
+ :call DoRecordScreen()
|
|
|
e393e44 |
:%w! test.out
|
|
|
e393e44 |
:qa!
|
|
|
e393e44 |
ENDTEST
|
|
|
e393e44 |
*** ../vim-7.4.421/src/testdir/test_listlbr.ok 2014-07-16 17:01:38.279570568 +0200
|
|
|
e393e44 |
--- src/testdir/test_listlbr.ok 2014-08-29 12:03:48.126423021 +0200
|
|
|
e393e44 |
***************
|
|
|
e393e44 |
*** 25,27 ****
|
|
|
e393e44 |
--- 25,34 ----
|
|
|
e393e44 |
+aaaaaaaaaaaaaaaaaa
|
|
|
e393e44 |
~
|
|
|
e393e44 |
~
|
|
|
e393e44 |
+ _S_ bla
|
|
|
e393e44 |
+
|
|
|
e393e44 |
+ Test 5: set linebreak with conceal and set list and tab displayed by different char (line may not be truncated)
|
|
|
e393e44 |
+ Sabbbbbb bla
|
|
|
e393e44 |
+ ~
|
|
|
e393e44 |
+ ~
|
|
|
e393e44 |
+ ~
|
|
|
e393e44 |
*** ../vim-7.4.421/src/version.c 2014-08-29 11:56:21.350422045 +0200
|
|
|
e393e44 |
--- src/version.c 2014-08-29 12:04:26.658423105 +0200
|
|
|
e393e44 |
***************
|
|
|
e393e44 |
*** 743,744 ****
|
|
|
e393e44 |
--- 743,746 ----
|
|
|
e393e44 |
{ /* Add new patch number below this line */
|
|
|
e393e44 |
+ /**/
|
|
|
e393e44 |
+ 422,
|
|
|
e393e44 |
/**/
|
|
|
e393e44 |
|
|
|
e393e44 |
--
|
|
|
e393e44 |
From "know your smileys":
|
|
|
e393e44 |
;-0 Can't find shift key
|
|
|
e393e44 |
,-9 Kann Umschalttaste nicht finden
|
|
|
e393e44 |
|
|
|
e393e44 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
e393e44 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
e393e44 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
e393e44 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|