From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 14 Jul 2013 11:32:15 +0000 (+0200)
Subject: updated for version 7.4a.022
X-Git-Tag: v7.4a.022
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91b2bdb083dc21c89af7101ce73cf1b547a7f91f;p=thirdparty%2Fvim.git

updated for version 7.4a.022
Problem:    Using "d2g$" does not delete the last character. (ZyX)
Solution:   Set the "inclusive" flag properly.
---

diff --git a/src/normal.c b/src/normal.c
index 762f3197be..80ada682ed 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -4545,7 +4545,7 @@ nv_screengo(oap, dir, dist)
     int		width2;		/* test width for wrapped screen line */
 
     oap->motion_type = MCHAR;
-    oap->inclusive = FALSE;
+    oap->inclusive = (curwin->w_curswant == MAXCOL);
 
     col_off1 = curwin_col_off();
     col_off2 = col_off1 - curwin_col_off2();
diff --git a/src/version.c b/src/version.c
index 59476e5233..f02bf35521 100644
--- a/src/version.c
+++ b/src/version.c
@@ -727,6 +727,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    22,
 /**/
     21,
 /**/