From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 26 Jun 2014 19:24:56 +0000 (+0200)
Subject: updated for version 7.4.346
X-Git-Tag: v7.4.346
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d7a592c8007d67627eac34edac14996926a99f8;p=vim

updated for version 7.4.346
Problem:    Indent is not updated when changing 'breakindentopt'. (itchyny)
Solution:   Do not cache "brishift". (Christian Brabandt)
---

diff --git a/src/misc1.c b/src/misc1.c
index ebcb0b233..fbd94d946 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -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);
 
diff --git a/src/version.c b/src/version.c
index a9d39dfe1..4adf3e55d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    346,
 /**/
     345,
 /**/