diff --git a/src/fileio.c b/src/fileio.c
index 470cce2..c177e63 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -7243,6 +7243,9 @@
 	 * reset it, might have had a read error. */
 	if (orig_mode == curbuf->b_orig_mode)
 	    curbuf->b_p_ro |= old_ro;
+
+	/* Modelines must override settings done by autocommands. */
+	do_modelines(0);
     }
 
     /* restore curwin/curbuf and a few other things */
diff --git a/src/version.c b/src/version.c
index ecf21ac..78dc34d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    790,
+/**/
     789,
 /**/
     788,