From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 30 Jan 2013 13:13:56 +0000 (+0100)
Subject: updated for version 7.3.790
X-Git-Tag: v7.3.790
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52f85b730e379c4519b4a9ef1f008417150713f7;p=vim

updated for version 7.3.790
Problem:    After reloading a buffer the modelines are not processed.
Solution:   call do_modelines(). (Ken Takata)
---

diff --git a/src/fileio.c b/src/fileio.c
index 470cce252..c177e633c 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -7243,6 +7243,9 @@ buf_reload(buf, orig_mode)
 	 * 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 ecf21ac96..78dc34db1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    790,
 /**/
     789,
 /**/