Mercurial > vim

diff src/screen.c @ 6172:69da1498ce89 v7.4.422

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.422 Problem: When using conceal with linebreak some text is not displayed correctly. (Gr?ner Gimpel) Solution: Check for conceal mode when using linebreak. (Christian Brabandt)
author Bram Moolenaar <bram@vim.org>
date Fri, 29 Aug 2014 12:08:43 +0200
parents 4c25af735304
children 0a4efa3d2019
line wrap: on
line diff
--- a/src/screen.c
+++ b/src/screen.c
@@ -4514,6 +4514,11 @@ win_line(wp, lnum, startrow, endrow, noc
 			int	i;
 			int	saved_nextra = n_extra;
 
+#ifdef FEAT_CONCEAL
+			if (is_concealing && vcol_off > 0)
+			    /* there are characters to conceal */
+			    tab_len += vcol_off;
+#endif
 			/* if n_extra > 0, it gives the number of chars, to
 			 * use for a tab, else we need to calculate the width
 			 * for a tab */
@@ -4539,6 +4544,12 @@ win_line(wp, lnum, startrow, endrow, noc
 #endif
 			}
 			p_extra = p_extra_free;
+#ifdef FEAT_CONCEAL
+			/* n_extra will be increased by FIX_FOX_BOGUSCOLS
+			 * macro below, so need to adjust for that here */
+			if (is_concealing && vcol_off > 0)
+			    n_extra -= vcol_off;
+#endif
 		    }
 #endif
 #ifdef FEAT_CONCEAL