From 995a8cd18190c0b922796a8ee865e95bd1dbd916 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 20 Feb 2013 16:54:27 +0100
Subject: [PATCH] updated for version 7.3.827 Problem:    Python tests fail.
 Solution:   Adjust the output for the stack trace.

---
 src/testdir/test86.in | 6 ++++++
 src/testdir/test86.ok | 2 +-
 src/testdir/test87.ok | 2 +-
 src/version.c         | 2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/testdir/test86.in b/src/testdir/test86.in
index 71635bda2f..5282269a3a 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 3dd8d79944..8960390f59 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 3dffa26d47..b8769002ab 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 d637b9fea3..204b7a173e 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,
 /**/