]> granicus.if.org Git - vim/commitdiff
updated for version 7.4.345 v7.4.345
authorBram Moolenaar <Bram@vim.org>
Wed, 25 Jun 2014 20:55:38 +0000 (22:55 +0200)
committerBram Moolenaar <Bram@vim.org>
Wed, 25 Jun 2014 20:55:38 +0000 (22:55 +0200)
Problem:    Indent is not updated when deleting indent.
Solution:   Remember changedtick.

src/misc1.c
src/version.c

index 1c2f8f274dc73bf56b9d3f904a395c060053df31..ebcb0b233fce7c19edc67474464731f7778e98f8 100644 (file)
@@ -497,6 +497,7 @@ get_breakindent_win(wp, line)
     static int     prev_indent = 0;  /* cached indent value */
     static long            prev_ts     = 0L; /* cached tabstop value */
     static char_u   *prev_line = NULL; /* cached pointer to line */
+    static int     prev_tick = 0;   /* changedtick of cached value */
     int                    bri = 0;
     /* window width minus window margin space, i.e. what rests for text */
     const int      eff_wwidth = W_WIDTH(wp)
@@ -505,10 +506,12 @@ get_breakindent_win(wp, line)
                                                ? number_width(wp) + 1 : 0);
 
     /* used cached indent, unless pointer or 'tabstop' changed */
-    if (prev_line != line || prev_ts != wp->w_buffer->b_p_ts)
+    if (prev_line != line || prev_ts != wp->w_buffer->b_p_ts
+                                 || prev_tick != wp->w_buffer->b_changedtick)
     {
        prev_line = 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;
     }
index adb9ef47150d5c6e22d96cfafef4a2b20fd82bbc..a9d39dfe1b7226355850dd90452a9fa8eda7e4ad 100644 (file)
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    345,
 /**/
     344,
 /**/