|
 |
eadf2d7 |
To: vim_dev@googlegroups.com
|
|
|
eadf2d7 |
Subject: Patch 7.4.346
|
|
|
eadf2d7 |
Fcc: outbox
|
|
|
eadf2d7 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
eadf2d7 |
Mime-Version: 1.0
|
|
|
eadf2d7 |
Content-Type: text/plain; charset=UTF-8
|
|
|
eadf2d7 |
Content-Transfer-Encoding: 8bit
|
|
|
eadf2d7 |
------------
|
|
|
eadf2d7 |
|
|
|
eadf2d7 |
Patch 7.4.346 (after 7.4.338)
|
|
|
eadf2d7 |
Problem: Indent is not updated when changing 'breakindentopt'. (itchyny)
|
|
|
eadf2d7 |
Solution: Do not cache "brishift". (Christian Brabandt)
|
|
|
eadf2d7 |
Files: src/misc1.c
|
|
|
eadf2d7 |
|
|
|
eadf2d7 |
|
|
|
eadf2d7 |
*** ../vim-7.4.345/src/misc1.c 2014-06-25 22:55:34.783474435 +0200
|
|
|
eadf2d7 |
--- src/misc1.c 2014-06-26 21:15:46.970516542 +0200
|
|
|
eadf2d7 |
***************
|
|
|
eadf2d7 |
*** 513,523 ****
|
|
|
eadf2d7 |
prev_ts = wp->w_buffer->b_p_ts;
|
|
|
eadf2d7 |
prev_tick = wp->w_buffer->b_changedtick;
|
|
|
eadf2d7 |
prev_indent = get_indent_str(line,
|
|
|
eadf2d7 |
! (int)wp->w_buffer->b_p_ts, wp->w_p_list) + wp->w_p_brishift;
|
|
|
eadf2d7 |
}
|
|
|
eadf2d7 |
|
|
|
eadf2d7 |
/* indent minus the length of the showbreak string */
|
|
|
eadf2d7 |
- bri = prev_indent;
|
|
|
eadf2d7 |
if (wp->w_p_brisbr)
|
|
|
eadf2d7 |
bri -= vim_strsize(p_sbr);
|
|
|
eadf2d7 |
|
|
|
eadf2d7 |
--- 513,523 ----
|
|
|
eadf2d7 |
prev_ts = wp->w_buffer->b_p_ts;
|
|
|
eadf2d7 |
prev_tick = wp->w_buffer->b_changedtick;
|
|
|
eadf2d7 |
prev_indent = get_indent_str(line,
|
|
|
eadf2d7 |
! (int)wp->w_buffer->b_p_ts, wp->w_p_list);
|
|
|
eadf2d7 |
}
|
|
|
eadf2d7 |
+ bri = prev_indent + wp->w_p_brishift;
|
|
|
eadf2d7 |
|
|
|
eadf2d7 |
/* indent minus the length of the showbreak string */
|
|
|
eadf2d7 |
if (wp->w_p_brisbr)
|
|
|
eadf2d7 |
bri -= vim_strsize(p_sbr);
|
|
|
eadf2d7 |
|
|
|
eadf2d7 |
*** ../vim-7.4.345/src/version.c 2014-06-25 22:55:34.783474435 +0200
|
|
|
eadf2d7 |
--- src/version.c 2014-06-26 21:17:10.342519697 +0200
|
|
|
eadf2d7 |
***************
|
|
|
eadf2d7 |
*** 736,737 ****
|
|
|
eadf2d7 |
--- 736,739 ----
|
|
|
eadf2d7 |
{ /* Add new patch number below this line */
|
|
|
eadf2d7 |
+ /**/
|
|
|
eadf2d7 |
+ 346,
|
|
|
eadf2d7 |
/**/
|
|
|
eadf2d7 |
|
|
|
eadf2d7 |
--
|
|
|
eadf2d7 |
A computer programmer is a device for turning requirements into
|
|
|
eadf2d7 |
undocumented features. It runs on cola, pizza and Dilbert cartoons.
|
|
|
eadf2d7 |
Bram Moolenaar
|
|
|
eadf2d7 |
|
|
|
eadf2d7 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
eadf2d7 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
eadf2d7 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
eadf2d7 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|