updated for version 7.0-126

diff --git a/src/edit.c b/src/edit.c
index 43a4c39a7395cac8d0b747da2e2bf611ac78baee..f0aecef208994c25b199eb7718cb30aa2c364a80 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -5333,8 +5333,16 @@ insertchar(c, flags, second_indent)
        /* Format with 'formatexpr' when it's set.  Use internal formatting
         * when 'formatexpr' isn't set or it returns non-zero. */
 #if defined(FEAT_EVAL)
-       if (*curbuf->b_p_fex == NUL
-                            || fex_format(curwin->w_cursor.lnum, 1L, c) != 0)
+       int do_internal = TRUE;
+
+       if (*curbuf->b_p_fex != NUL)
+       {
+           do_internal = (fex_format(curwin->w_cursor.lnum, 1L, c) != 0);
+           /* It may be required to save for undo again, e.g. when setline()
+            * was called. */
+           ins_need_undo = TRUE;
+       }
+       if (do_internal)
 #endif
            internal_format(textwidth, second_indent, flags, c == NUL);
     }

diff --git a/src/version.c b/src/version.c
index 6ff099e9f547809b0d0f9e5c37f9dd8e920b9dd5..5c5685243fa77ce8b338f13d5688adae1ec40632 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    126,
 /**/
     125,
 /**/