summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/normal.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/normal.c b/src/normal.c
index 762f3197b..80ada682e 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 59476e523..f02bf3552 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 22,
+/**/
21,
/**/
20,