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 470cce2525fc8671d0e916eb5b41157a352d380d..c177e633c5a451795f023e744a7da6387cad7cdb 100644 (file)
--- 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 ecf21ac9679c3162b3a505ddd8840d9ca26044da..78dc34db10bae7cb22a124ad67377fb2d2c15d22 100644 (file)
--- 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,
 /**/