From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 15 Apr 2013 14:14:22 +0000 (+0200)
Subject: updated for version 7.3.903
X-Git-Tag: v7.3.903
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8565fecc62e95a3a284be2ae20129cebe6432be;p=thirdparty%2Fvim.git

updated for version 7.3.903
Problem:    Crash on exit writing viminfo. (Ron Aaron)
Solution:   Check for the history to be empty.
---

diff --git a/src/ex_getln.c b/src/ex_getln.c
index c16c1ab380..a7a1409b0a 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -6216,7 +6216,15 @@ write_viminfo_history(fp)
 	 */
 	for (round = 1; round <= 2; ++round)
 	{
-	    i = round == 1 ? hisidx[type] : 0;
+	    if (round == 1)
+		/* start at newest entry, somewhere in the list */
+		i = hisidx[type];
+	    else if (viminfo_hisidx[type] > 0)
+		/* start at newest entry, first in the list */
+		i = 0;
+	    else
+		/* empty list */
+		i = -1;
 	    if (i >= 0)
 		while (num_saved > 0
 			&& !(round == 2 && i >= viminfo_hisidx[type]))
diff --git a/src/version.c b/src/version.c
index edeab45a37..cf06da6008 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    903,
 /**/
     902,
 /**/