|
 |
fd1026d |
To: vim_dev@googlegroups.com
|
|
|
fd1026d |
Subject: Patch 7.4.352
|
|
|
fd1026d |
Fcc: outbox
|
|
|
fd1026d |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
fd1026d |
Mime-Version: 1.0
|
|
|
fd1026d |
Content-Type: text/plain; charset=UTF-8
|
|
|
fd1026d |
Content-Transfer-Encoding: 8bit
|
|
|
fd1026d |
------------
|
|
|
fd1026d |
|
|
|
fd1026d |
Patch 7.4.352
|
|
|
fd1026d |
Problem: With 'linebreak' a tab causes missing line break.
|
|
|
fd1026d |
Solution: Count a tab for what it's worth also for shorter lines.
|
|
|
fd1026d |
(Christian Brabandt)
|
|
|
fd1026d |
Files: src/charset.c
|
|
|
fd1026d |
|
|
|
fd1026d |
|
|
|
fd1026d |
*** ../vim-7.4.351/src/charset.c 2014-06-25 14:39:35.098348584 +0200
|
|
|
fd1026d |
--- src/charset.c 2014-07-02 19:34:28.142352040 +0200
|
|
|
fd1026d |
***************
|
|
|
fd1026d |
*** 1078,1083 ****
|
|
|
fd1026d |
--- 1078,1084 ----
|
|
|
fd1026d |
int c;
|
|
|
fd1026d |
int size;
|
|
|
fd1026d |
colnr_T col2;
|
|
|
fd1026d |
+ colnr_T col_adj = 0; /* col + screen size of tab */
|
|
|
fd1026d |
colnr_T colmax;
|
|
|
fd1026d |
int added;
|
|
|
fd1026d |
# ifdef FEAT_MBYTE
|
|
|
fd1026d |
***************
|
|
|
fd1026d |
*** 1109,1114 ****
|
|
|
fd1026d |
--- 1110,1117 ----
|
|
|
fd1026d |
*/
|
|
|
fd1026d |
size = win_chartabsize(wp, s, col);
|
|
|
fd1026d |
c = *s;
|
|
|
fd1026d |
+ if (tab_corr)
|
|
|
fd1026d |
+ col_adj = size - 1;
|
|
|
fd1026d |
|
|
|
fd1026d |
/*
|
|
|
fd1026d |
* If 'linebreak' set check at a blank before a non-blank if the line
|
|
|
fd1026d |
***************
|
|
|
fd1026d |
*** 1130,1141 ****
|
|
|
fd1026d |
*/
|
|
|
fd1026d |
numberextra = win_col_off(wp);
|
|
|
fd1026d |
col2 = col;
|
|
|
fd1026d |
! colmax = (colnr_T)(W_WIDTH(wp) - numberextra);
|
|
|
fd1026d |
if (col >= colmax)
|
|
|
fd1026d |
{
|
|
|
fd1026d |
! n = colmax + win_col_off2(wp);
|
|
|
fd1026d |
if (n > 0)
|
|
|
fd1026d |
! colmax += (((col - colmax) / n) + 1) * n;
|
|
|
fd1026d |
}
|
|
|
fd1026d |
|
|
|
fd1026d |
for (;;)
|
|
|
fd1026d |
--- 1133,1145 ----
|
|
|
fd1026d |
*/
|
|
|
fd1026d |
numberextra = win_col_off(wp);
|
|
|
fd1026d |
col2 = col;
|
|
|
fd1026d |
! colmax = (colnr_T)(W_WIDTH(wp) - numberextra - col_adj);
|
|
|
fd1026d |
if (col >= colmax)
|
|
|
fd1026d |
{
|
|
|
fd1026d |
! colmax += col_adj;
|
|
|
fd1026d |
! n = colmax + win_col_off2(wp);
|
|
|
fd1026d |
if (n > 0)
|
|
|
fd1026d |
! colmax += (((col - colmax) / n) + 1) * n - col_adj;
|
|
|
fd1026d |
}
|
|
|
fd1026d |
|
|
|
fd1026d |
for (;;)
|
|
|
fd1026d |
***************
|
|
|
fd1026d |
*** 1152,1158 ****
|
|
|
fd1026d |
col2 += win_chartabsize(wp, s, col2);
|
|
|
fd1026d |
if (col2 >= colmax) /* doesn't fit */
|
|
|
fd1026d |
{
|
|
|
fd1026d |
! size = colmax - col;
|
|
|
fd1026d |
tab_corr = FALSE;
|
|
|
fd1026d |
break;
|
|
|
fd1026d |
}
|
|
|
fd1026d |
--- 1156,1162 ----
|
|
|
fd1026d |
col2 += win_chartabsize(wp, s, col2);
|
|
|
fd1026d |
if (col2 >= colmax) /* doesn't fit */
|
|
|
fd1026d |
{
|
|
|
fd1026d |
! size = colmax - col + col_adj;
|
|
|
fd1026d |
tab_corr = FALSE;
|
|
|
fd1026d |
break;
|
|
|
fd1026d |
}
|
|
|
fd1026d |
*** ../vim-7.4.351/src/version.c 2014-07-02 19:06:14.686326091 +0200
|
|
|
fd1026d |
--- src/version.c 2014-07-02 19:32:50.218350540 +0200
|
|
|
fd1026d |
***************
|
|
|
fd1026d |
*** 736,737 ****
|
|
|
fd1026d |
--- 736,739 ----
|
|
|
fd1026d |
{ /* Add new patch number below this line */
|
|
|
fd1026d |
+ /**/
|
|
|
fd1026d |
+ 352,
|
|
|
fd1026d |
/**/
|
|
|
fd1026d |
|
|
|
fd1026d |
--
|
|
|
fd1026d |
The early bird gets the worm. The second mouse gets the cheese.
|
|
|
fd1026d |
|
|
|
fd1026d |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
fd1026d |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
fd1026d |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
fd1026d |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|