From b9474fc01dfbc60f0f28867b105e1916739cb765 Mon Sep 17 00:00:00 2001
From: edyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Date: Thu, 8 Nov 2007 12:40:47 +0000
Subject: [PATCH] Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@642 2a77ed30-b011-0410-a7ad-c7884a0aa172
---
 src/edit.c    | 4 ++--
 src/version.c | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/edit.c b/src/edit.c
index b1a13a9e..c16daddd 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -2111,7 +2111,7 @@ ins_compl_add_infercase(str, len, icase, fname, dir, flags)
     int		has_lower = FALSE;
     int		was_letter = FALSE;
 
-    if (p_ic && curbuf->b_p_inf)
+    if (p_ic && curbuf->b_p_inf && len > 0)
     {
 	/* Infer case of completed part. */
 
@@ -2225,7 +2225,7 @@ ins_compl_add_infercase(str, len, icase, fname, dir, flags)
 		    wca[i] = MB_TOUPPER(wca[i]);
 	    }
 
-	    /* 
+	    /*
 	     * Generate encoding specific output from wide character array.
 	     * Multi-byte characters can occupy up to five bytes more than
 	     * ASCII characters, and we also need one byte for NUL, so stay
diff --git a/src/version.c b/src/version.c
index d365e859..be8df81d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    151,
+/**/
     150,
 /**/
     149,
-- 
2.11.4.GIT