3 files changed, 8 insertions, 4 deletions
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 0263bd15da..dfa89acb1a 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -4679,6 +4679,8 @@ int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1)
 theend:
   if (visual) {
     curwin->w_cursor = save_cursor;
+  } else if (did_change) {
+    curwin->w_set_curswant = true;
   }
 
   return did_change;
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index f23037613b..d6697902ef 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -2970,6 +2970,7 @@ void ex_vimgrep(exarg_T *eap)
 
   /* Get the search pattern: either white-separated or enclosed in // */
   regmatch.regprog = NULL;
+  char_u *title = vim_strsave(*eap->cmdlinep);
   p = skip_vimgrep_pat(eap->arg, &s, &flags);
   if (p == NULL) {
     EMSG(_(e_invalpat));
@@ -3001,7 +3002,7 @@ void ex_vimgrep(exarg_T *eap)
        && eap->cmdidx != CMD_vimgrepadd && eap->cmdidx != CMD_lvimgrepadd)
       || qi->qf_curlist == qi->qf_listcount) {
     // make place for a new list
-    qf_new_list(qi, *eap->cmdlinep);
+    qf_new_list(qi, title != NULL ? title : *eap->cmdlinep);
   } else if (qi->qf_lists[qi->qf_curlist].qf_count > 0) {
     // Adding to existing list, find last entry.
     for (prevp = qi->qf_lists[qi->qf_curlist].qf_start;
@@ -3229,6 +3230,7 @@ void ex_vimgrep(exarg_T *eap)
   }
 
 theend:
+  xfree(title);
   xfree(dirname_now);
   xfree(dirname_start);
   xfree(target_dir);
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 055a997cd4..a51c2b6ea9 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -810,7 +810,7 @@ static int included_patches[] = {
   // 1637 NA
   // 1636 NA
   // 1635 NA
-  // 1634,
+  1634,
   // 1633 NA
   // 1632 NA
   // 1631 NA
@@ -830,7 +830,7 @@ static int included_patches[] = {
   // 1617 NA
   // 1616 NA
   // 1615 NA
-  // 1614,
+  1614,
   // 1613 NA
   // 1612 NA
   // 1611 NA
@@ -853,7 +853,7 @@ static int included_patches[] = {
   // 1594 NA
   // 1593 NA
   1592,
-  // 1591,
+  1591,
   // 1590,
   // 1589,
   1588,