diff --git a/src/edit.c b/src/edit.c
index 626d327..abe26fb 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -1590,7 +1590,9 @@
 		curwin->w_p_cole > 0
 # endif
 		)
+# ifdef FEAT_AUTOCMD
 	&& !equalpos(last_cursormoved, curwin->w_cursor)
+# endif
 # ifdef FEAT_INS_EXPAND
 	&& !pum_visible()
 # endif
@@ -1616,12 +1618,16 @@
 # ifdef FEAT_CONCEAL
 	if (curwin->w_p_cole > 0)
 	{
+#  ifdef FEAT_AUTOCMD
 	    conceal_old_cursor_line = last_cursormoved.lnum;
+#  endif
 	    conceal_new_cursor_line = curwin->w_cursor.lnum;
 	    conceal_update_lines = TRUE;
 	}
 # endif
+# ifdef FEAT_AUTOCMD
 	last_cursormoved = curwin->w_cursor;
+# endif
     }
 #endif
 
diff --git a/src/main.c b/src/main.c
index 4005f10..a7bc9e9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1176,7 +1176,10 @@
 			curwin->w_p_cole > 0
 # endif
 			)
-		 && !equalpos(last_cursormoved, curwin->w_cursor))
+# ifdef FEAT_AUTOCMD
+		 && !equalpos(last_cursormoved, curwin->w_cursor)
+# endif
+		 )
 	    {
 # ifdef FEAT_AUTOCMD
 		if (has_cursormoved())
@@ -1186,12 +1189,16 @@
 # ifdef FEAT_CONCEAL
 		if (curwin->w_p_cole > 0)
 		{
+#  ifdef FEAT_AUTOCMD
 		    conceal_old_cursor_line = last_cursormoved.lnum;
+#  endif
 		    conceal_new_cursor_line = curwin->w_cursor.lnum;
 		    conceal_update_lines = TRUE;
 		}
 # endif
+# ifdef FEAT_AUTOCMD
 		last_cursormoved = curwin->w_cursor;
+# endif
 	    }
 #endif
 
diff --git a/src/syntax.c b/src/syntax.c
index b385d1a..e37dacb 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -6342,9 +6342,11 @@
     if (old_value != NULL)
 	old_value = vim_strsave(old_value);
 
+#ifdef FEAT_AUTOCMD
     /* Apply the "syntax" autocommand event, this finds and loads the syntax
      * file. */
     apply_autocmds(EVENT_SYNTAX, eap->arg, curbuf->b_fname, TRUE, curbuf);
+#endif
 
     /* move value of b:current_syntax to w:current_syntax */
     new_value = get_var_value((char_u *)"b:current_syntax");
diff --git a/src/version.c b/src/version.c
index 8ed000b..a48d5ba 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1473,
+/**/
     1472,
 /**/
     1471,