From 07e11e40e8e34ec020dc94502c121293981757ef Mon Sep 17 00:00:00 2001
From: edyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Date: Thu, 11 Jun 2009 05:37:47 +0000
Subject: [PATCH] Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1513 2a77ed30-b011-0410-a7ad-c7884a0aa172
---
 src/globals.h | 2 +-
 src/version.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/globals.h b/src/globals.h
index b870962d..f5df8473 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -960,7 +960,7 @@ EXTERN struct buffheader stuffbuff	/* stuff buffer */
 		    ;
 EXTERN typebuf_T typebuf		/* typeahead buffer */
 #ifdef DO_INIT
-		    = {NULL, NULL}
+		    = {NULL, NULL, 0, 0, 0, 0, 0, 0, 0}
 #endif
 		    ;
 #ifdef FEAT_EX_EXTRA
diff --git a/src/version.c b/src/version.c
index 0a7e5174..b570d2d4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    197,
+/**/
     196,
 /**/
     195,
-- 
2.11.4.GIT