From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 3 Oct 2012 11:35:51 +0000 (+0200)
Subject: updated for version 7.3.673
X-Git-Tag: v7.3.673
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=718f007499a5d3f0ff9c0a645780133131ab2b2e;p=thirdparty%2Fvim.git

updated for version 7.3.673
Problem:    Using "gN" while 'selection' is "exclusive" misses one character.
            (Ben Fritz)
Solution:   Check the direction when compensating for exclusive selection.
            (Christian Brabandt)
---

diff --git a/src/search.c b/src/search.c
index 158cfd8f5d..d7bfc43b14 100644
--- a/src/search.c
+++ b/src/search.c
@@ -4650,8 +4650,15 @@ current_search(count, forward)
     if (VIsual_active)
     {
 	redraw_curbuf_later(INVERTED);	/* update the inversion */
-	if (*p_sel == 'e' && ltoreq(VIsual, curwin->w_cursor))
-	    inc_cursor();
+	if (*p_sel == 'e')
+	{
+	    /* Correction for exclusive selection depends on the direction. */
+	    if (forward && ltoreq(VIsual, curwin->w_cursor))
+		inc_cursor();
+	    else if (!forward && ltoreq(curwin->w_cursor, VIsual))
+		inc(&VIsual);
+	}
+
     }
 
 #ifdef FEAT_FOLDING
diff --git a/src/version.c b/src/version.c
index cd50417553..e8fcf2c41a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    673,
 /**/
     672,
 /**/