summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-01-30 14:13:56 +0100
committerBram Moolenaar <Bram@vim.org>2013-01-30 14:13:56 +0100
commit52f85b730e379c4519b4a9ef1f008417150713f7 (patch)
tree1031e944273806d3aca7d5e522dfcc7bb7cbf174
parentf813a1883f767ad9c4a7a44b5f42cee312d53bc0 (diff)
downloadvim-52f85b730e379c4519b4a9ef1f008417150713f7.zip
updated for version 7.3.790
Problem: After reloading a buffer the modelines are not processed. Solution: call do_modelines(). (Ken Takata)
-rw-r--r--src/fileio.c3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
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
@@ -726,6 +726,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 790,
+/**/
789,
/**/
788,