diff src/search.c @ 11478:29a781fd3f27 v8.0.0622

patch 8.0.0622: selecting quoted text fails with 'selection' "exclusive" commit https://github.com/vim/vim/commit/c5e2b040b490c2f4dd50c945840bc176bfcccb29 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jun 5 16:37:07 2017 +0200 patch 8.0.0622: selecting quoted text fails with 'selection' "exclusive" Problem: Using a text object to select quoted text fails when 'selection' is set to "exclusive". (Guraga) Solution: Swap cursor and visual start position. (Christian Brabandt, closes #1687)
author Christian Brabandt <cb@256bit.org>
date Mon, 05 Jun 2017 16:45:03 +0200
parents c45fb081391c
children 9473793c7bb5
line wrap: on
line diff
--- a/src/search.c
+++ b/src/search.c
@@ -4364,7 +4364,7 @@ current_quote(
     int		selected_quote = FALSE;	/* Has quote inside selection */
     int		i;
 
-    /* Correct cursor when 'selection' is exclusive */
+    /* Correct cursor when 'selection' is "exclusive". */
     if (VIsual_active)
     {
 	/* this only works within one line */
@@ -4372,8 +4372,19 @@ current_quote(
 	    return FALSE;
 
 	vis_bef_curs = LT_POS(VIsual, curwin->w_cursor);
-	if (*p_sel == 'e' && vis_bef_curs)
+	if (*p_sel == 'e')
+	{
+	    if (!vis_bef_curs)
+	    {
+		/* VIsual needs to be start of Visual selection. */
+		pos_T t = curwin->w_cursor;
+
+		curwin->w_cursor = VIsual;
+		VIsual = t;
+		vis_bef_curs = TRUE;
+	    }
 	    dec_cursor();
+	}
 	vis_empty = EQUAL_POS(VIsual, curwin->w_cursor);
     }