updated for version 7.4.146

Problem:    When starting Vim with "-u NONE" v:oldfiles is NULL.
Solution:   Set v:oldfiles to an empty list. (Yasuhiro Matsumoto)

diff --git a/src/main.c b/src/main.c
index 04077957c758308a216d163fab7b070709728385..79521ef468ca7c89de9429192418b8c2e5276bdd 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -702,6 +702,11 @@ vim_main2(int argc UNUSED, char **argv UNUSED)
        TIME_MSG("reading viminfo");
     }
 #endif
+#ifdef FEAT_EVAL
+    /* It's better to make v:oldfiles an empty list than NULL. */
+    if (get_vim_var_list(VV_OLDFILES) == NULL)
+       set_vim_var_list(VV_OLDFILES, list_alloc());
+#endif
 
 #ifdef FEAT_QUICKFIX
     /*
@@ -1048,7 +1053,7 @@ main_loop(cmdwin, noexmode)
     /* Setup to catch a terminating error from the X server.  Just ignore
      * it, restore the state and continue.  This might not always work
      * properly, but at least we don't exit unexpectedly when the X server
-     * exists while Vim is running in a console. */
+     * exits while Vim is running in a console. */
     if (!cmdwin && !noexmode && SETJMP(x_jump_env))
     {
        State = NORMAL;

diff --git a/src/version.c b/src/version.c
index ed8a10adba8c7112327f4c6292427b7f358cf905..7be350c7d48a85c9029c10a59ae1eeca290bd70f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    146,
 /**/
     145,
 /**/