diff --git a/src/misc1.c b/src/misc1.c
index 0c2b797cf7..ed6c629949 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -2842,7 +2842,8 @@ changed_common(lnum, col, lnume, xtra)
 
 #ifdef FEAT_AUTOCMD
     /* when the cursor line is changed always trigger CursorMoved */
-    if (lnum <= curwin->w_cursor.lnum && lnume > curwin->w_cursor.lnum)
+    if (lnum <= curwin->w_cursor.lnum
+		 && lnume + (xtra < 0 ? -xtra : xtra) > curwin->w_cursor.lnum)
 	last_cursormoved.lnum = 0;
 #endif
 }
diff --git a/src/version.c b/src/version.c
index c701666582..f442ba30a6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    136,
 /**/
     135,
 /**/