1 files changed, 16 insertions, 4 deletions

diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index e6d63d08a7..81fce3565a 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -1366,7 +1366,7 @@ static void do_filter(linenr_T line1, linenr_T line2, exarg_T *eap, char_u *cmd,
   ui_cursor_goto(Rows - 1, 0);
 
   if (do_out) {
-    if (u_save((line2), (linenr_T)(line2 + 1)) == FAIL) {
+    if (u_save(line2, (linenr_T)(line2 + 1)) == FAIL) {
       xfree(cmd_buf);
       goto error;
     }
@@ -3055,7 +3055,7 @@ void ex_append(exarg_T *eap)
   // it is the same as "start"  -- Acevedo
   if (!cmdmod.lockmarks) {
     curbuf->b_op_start.lnum
-        = (eap->line2 < curbuf->b_ml.ml_line_count) ? eap->line2 + 1 : curbuf->b_ml.ml_line_count;
+      = (eap->line2 < curbuf->b_ml.ml_line_count) ? eap->line2 + 1 : curbuf->b_ml.ml_line_count;
     if (eap->cmdidx != CMD_append) {
       curbuf->b_op_start.lnum--;
     }
@@ -3652,8 +3652,14 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout, bool do_buf_event, handle
   // We do it here once to avoid it to be replaced over and over again.
   // But don't do it when it starts with "\=", then it's an expression.
   assert(sub != NULL);
+
+  bool sub_needs_free = false;
   if (!(sub[0] == '\\' && sub[1] == '=')) {
+    char_u *source = sub;
     sub = regtilde(sub, p_magic);
+    // When previewing, the new pattern allocated by regtilde() needs to be freed
+    // in this function because it will not be used or freed by regtilde() later.
+    sub_needs_free = preview && sub != source;
   }
 
   // Check for a match on each line.
@@ -4450,6 +4456,10 @@ skip:
 
   kv_destroy(preview_lines.subresults);
 
+  if (sub_needs_free) {
+    xfree(sub);
+  }
+
   return preview_buf;
 #undef ADJUST_SUB_FIRSTLNUM
 #undef PUSH_PREVIEW_LINES
@@ -6131,12 +6141,14 @@ char_u *skip_vimgrep_pat(char_u *p, char_u **s, int *flags)
     p++;
 
     // Find the flags
-    while (*p == 'g' || *p == 'j') {
+    while (*p == 'g' || *p == 'j' || *p == 'f') {
       if (flags != NULL) {
         if (*p == 'g') {
           *flags |= VGR_GLOBAL;
-        } else {
+        } else if (*p == 'j') {
           *flags |= VGR_NOJUMP;
+        } else {
+          *flags |= VGR_FUZZY;
         }
       }
       p++;