summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-01-14 12:57:05 +0100
committerBram Moolenaar <Bram@vim.org>2014-01-14 12:57:05 +0100
commit2cd3696c35877e2b3e8826336fb37833a3dfa4b6 (patch)
treea65270801c0230d631c73d868093e81bccee0c7c
parent32b9201f3726b26d1b5a558f95919cf0575a4b78 (diff)
updated for version 7.4.146v7.4.146
Problem: When starting Vim with "-u NONE" v:oldfiles is NULL. Solution: Set v:oldfiles to an empty list. (Yasuhiro Matsumoto)
-rw-r--r--src/main.c7
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index 04077957c7..79521ef468 100644
--- 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 ed8a10adba..7be350c7d4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 146,
+/**/
145,
/**/
144,