From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 20 Feb 2013 15:54:27 +0000 (+0100)
Subject: updated for version 7.3.827
X-Git-Tag: v7.3.827
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=995a8cd18190c0b922796a8ee865e95bd1dbd916;p=vim

updated for version 7.3.827
Problem:    Python tests fail.
Solution:   Adjust the output for the stack trace.
---

diff --git a/src/testdir/test86.in b/src/testdir/test86.in
index 71635bda2..5282269a3 100644
--- a/src/testdir/test86.in
+++ b/src/testdir/test86.in
@@ -1,5 +1,11 @@
 Tests for various python features.     vim: set ft=vim :
 
+NOTE: This will cause errors when run under valgrind.
+This would require recompiling Python with:
+  ./configure --without-pymalloc
+See http://svn.python.org/view/python/trunk/Misc/README.valgrind?view=markup
+
+
 STARTTEST
 :so small.vim
 :if !has('python') | e! test.ok | wq! test.out | endif
diff --git a/src/testdir/test86.ok b/src/testdir/test86.ok
index 3dd8d7994..8960390f5 100644
--- a/src/testdir/test86.ok
+++ b/src/testdir/test86.ok
@@ -61,7 +61,7 @@ ll:[1]
 0.0
 "\0":	Vim(let):E859:
 {"\0": 1}:	Vim(let):E859:
-undefined_name:	Vim(let):E858:
+undefined_name:	Vim(let):Trace
 vim:	Vim(let):E859:
 [1]
 [1, 10, 11, 10, 11, 10, 11, 10, 11, 10, 11, 10, 1]
diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok
index 3dffa26d4..b8769002a 100644
--- a/src/testdir/test87.ok
+++ b/src/testdir/test87.ok
@@ -61,7 +61,7 @@ ll:[1]
 0.0
 "\0":	Vim(let):E861:
 {"\0": 1}:	Vim(let):E861:
-undefined_name:	Vim(let):E860:
+undefined_name:	Vim(let):Trace
 vim:	Vim(let):E861:
 [1]
 [1, 10, 11, 10, 11, 10, 11, 10, 11, 10, 11, 10, 1]
diff --git a/src/version.c b/src/version.c
index d637b9fea..204b7a173 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 */
+/**/
+    827,
 /**/
     826,
 /**/