1 files changed, 42 insertions, 21 deletions

diff --git a/src/nvim/search.c b/src/nvim/search.c
index b09931b337..6f0479cc39 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -3687,11 +3687,12 @@ current_quote(
   int col_end;
   int col_start = curwin->w_cursor.col;
   bool inclusive = false;
-  int vis_empty = TRUE;                 /* Visual selection <= 1 char */
-  int vis_bef_curs = FALSE;             /* Visual starts before cursor */
-  int inside_quotes = FALSE;            /* Looks like "i'" done before */
-  int selected_quote = FALSE;           /* Has quote inside selection */
+  int vis_empty = true;                 // Visual selection <= 1 char
+  int vis_bef_curs = false;             // Visual starts before cursor
+  int inside_quotes = false;            // Looks like "i'" done before
+  int selected_quote = false;           // Has quote inside selection
   int i;
+  int restore_vis_bef = false;          // resotre VIsual on abort
 
   // Correct cursor when 'selection' is "exclusive".
   if (VIsual_active) {
@@ -3709,6 +3710,7 @@ current_quote(
         curwin->w_cursor = VIsual;
         VIsual = t;
         vis_bef_curs = true;
+        restore_vis_bef = true;
       }
       dec_cursor();
     }
@@ -3749,8 +3751,9 @@ current_quote(
       /* Assume we are on a closing quote: move to after the next
        * opening quote. */
       col_start = find_next_quote(line, col_start + 1, quotechar, NULL);
-      if (col_start < 0)
-        return FALSE;
+      if (col_start < 0) {
+        goto abort_search;
+      }
       col_end = find_next_quote(line, col_start + 1, quotechar,
           curbuf->b_p_qe);
       if (col_end < 0) {
@@ -3760,8 +3763,9 @@ current_quote(
       }
     } else {
       col_end = find_prev_quote(line, col_start, quotechar, NULL);
-      if (line[col_end] != quotechar)
-        return FALSE;
+      if (line[col_end] != quotechar) {
+        goto abort_search;
+      }
       col_start = find_prev_quote(line, col_end, quotechar,
           curbuf->b_p_qe);
       if (line[col_start] != quotechar) {
@@ -3789,17 +3793,20 @@ current_quote(
     for (;; ) {
       /* Find open quote character. */
       col_start = find_next_quote(line, col_start, quotechar, NULL);
-      if (col_start < 0 || col_start > first_col)
-        return FALSE;
-      /* Find close quote character. */
+      if (col_start < 0 || col_start > first_col) {
+        goto abort_search;
+      }
+      // Find close quote character.
       col_end = find_next_quote(line, col_start + 1, quotechar,
           curbuf->b_p_qe);
-      if (col_end < 0)
-        return FALSE;
-      /* If is cursor between start and end quote character, it is
-       * target text object. */
-      if (col_start <= first_col && first_col <= col_end)
+      if (col_end < 0) {
+        goto abort_search;
+      }
+      // If is cursor between start and end quote character, it is
+      // target text object.
+      if (col_start <= first_col && first_col <= col_end) {
         break;
+      }
       col_start = col_end + 1;
     }
   } else {
@@ -3808,15 +3815,17 @@ current_quote(
     if (line[col_start] != quotechar) {
       /* No quote before the cursor, look after the cursor. */
       col_start = find_next_quote(line, col_start, quotechar, NULL);
-      if (col_start < 0)
-        return FALSE;
+      if (col_start < 0) {
+        goto abort_search;
+      }
     }
 
     /* Find close quote character. */
     col_end = find_next_quote(line, col_start + 1, quotechar,
-        curbuf->b_p_qe);
-    if (col_end < 0)
-      return FALSE;
+                              curbuf->b_p_qe);
+    if (col_end < 0) {
+      goto abort_search;
+    }
   }
 
   /* When "include" is TRUE, include spaces after closing quote or before
@@ -3893,6 +3902,18 @@ current_quote(
   }
 
   return OK;
+
+abort_search:
+  if (VIsual_active && *p_sel == 'e') {
+    inc_cursor();
+    if (restore_vis_bef) {
+       pos_T t = curwin->w_cursor;
+
+       curwin->w_cursor = VIsual;
+       VIsual = t;
+    }
+  }
+  return FALSE;
 }