]> granicus.if.org Git - vim/commitdiff
updated for version 7.4.346 v7.4.346
authorBram Moolenaar <Bram@vim.org>
Thu, 26 Jun 2014 19:24:56 +0000 (21:24 +0200)
committerBram Moolenaar <Bram@vim.org>
Thu, 26 Jun 2014 19:24:56 +0000 (21:24 +0200)
Problem:    Indent is not updated when changing 'breakindentopt'. (itchyny)
Solution:   Do not cache "brishift". (Christian Brabandt)

src/misc1.c
src/version.c

index ebcb0b233fce7c19edc67474464731f7778e98f8..fbd94d94627e308fc8c18167827051a98df7db74 100644 (file)
@@ -513,11 +513,11 @@ get_breakindent_win(wp, line)
        prev_ts = wp->w_buffer->b_p_ts;
        prev_tick = wp->w_buffer->b_changedtick;
        prev_indent = get_indent_str(line,
-                 (int)wp->w_buffer->b_p_ts, wp->w_p_list) + wp->w_p_brishift;
+                                    (int)wp->w_buffer->b_p_ts, wp->w_p_list);
     }
+    bri = prev_indent + wp->w_p_brishift;
 
     /* indent minus the length of the showbreak string */
-    bri = prev_indent;
     if (wp->w_p_brisbr)
        bri -= vim_strsize(p_sbr);
 
index a9d39dfe1b7226355850dd90452a9fa8eda7e4ad..4adf3e55d909440211cb967362b6a80cba5c0137 100644 (file)
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    346,
 /**/
     345,
 /**/