summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/getchar.c12
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 6 deletions
diff --git a/src/getchar.c b/src/getchar.c
index 2fb9baaf85..f4dce0222a 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -3328,15 +3328,15 @@ vgetorpeek(int advance)
{
if (curwin->w_wcol > 0)
{
- if (did_ai)
+ // After auto-indenting and no text is following,
+ // we are expecting to truncate the trailing
+ // white-space, so find the last non-white
+ // character -- webb
+ if (did_ai && *skipwhite(ml_get_curline()
+ + curwin->w_cursor.col) == NUL)
{
chartabsize_T cts;
- /*
- * We are expecting to truncate the trailing
- * white-space, so find the last non-white
- * character -- webb
- */
curwin->w_wcol = 0;
ptr = ml_get_curline();
init_chartabsize_arg(&cts, curwin,
diff --git a/src/version.c b/src/version.c
index 47052dda68..1bb82e2492 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1244,
+/**/
1243,
/**/
1242,