From 56661a60078ad43f9b706f68c3242b66197ccd9d Mon Sep 17 00:00:00 2001
From: edyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Date: Fri, 25 Dec 2009 03:52:20 +0000
Subject: [PATCH] Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1704 2a77ed30-b011-0410-a7ad-c7884a0aa172
---
 src/edit.c    | 4 ++++
 src/eval.c    | 1 +
 src/gui_w32.c | 8 ++++----
 src/normal.c  | 1 +
 src/version.c | 6 ++++++
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/edit.c b/src/edit.c
index 19e5b8d5..75b18084 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -7397,6 +7397,10 @@ in_cinkeys(keytyped, when, line_is_empty)
     int		icase;
     int		i;
 
+    if (keytyped == NUL)
+	/* Can happen with CTRL-Y and CTRL-E on a short line. */
+	return FALSE;
+
 #ifdef FEAT_EVAL
     if (*curbuf->b_p_inde != NUL)
 	look = curbuf->b_p_indk;	/* 'indentexpr' set: use 'indentkeys' */
diff --git a/src/eval.c b/src/eval.c
index 9f704677..0ce6ff14 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -12014,6 +12014,7 @@ f_histadd(argvars, rettv)
 	str = get_tv_string_buf(&argvars[1], buf);
 	if (*str != NUL)
 	{
+	    init_history();
 	    add_to_history(histype, str, FALSE, NUL);
 	    rettv->vval.v_number = TRUE;
 	    return;
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 164e8c61..5a43d826 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -212,12 +212,14 @@ typedef struct _DllVersionInfo
     DWORD dwPlatformID;
 } DLLVERSIONINFO;
 
+#include <poppack.h>
+
 typedef struct tagTOOLINFOA_NEW
 {
 	UINT cbSize;
 	UINT uFlags;
 	HWND hwnd;
-	UINT uId;
+	UINT_PTR uId;
 	RECT rect;
 	HINSTANCE hinst;
 	LPSTR lpszText;
@@ -227,15 +229,13 @@ typedef struct tagTOOLINFOA_NEW
 typedef struct tagNMTTDISPINFO_NEW
 {
     NMHDR      hdr;
-    LPTSTR     lpszText;
+    LPSTR      lpszText;
     char       szText[80];
     HINSTANCE  hinst;
     UINT       uFlags;
     LPARAM     lParam;
 } NMTTDISPINFO_NEW;
 
-#include <poppack.h>
-
 typedef HRESULT (WINAPI* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
 #ifndef TTM_SETMAXTIPWIDTH
 # define TTM_SETMAXTIPWIDTH	(WM_USER+24)
diff --git a/src/normal.c b/src/normal.c
index 160beb65..befe4ac9 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -5602,6 +5602,7 @@ nv_ident(cap)
 	    STRCAT(buf, "\\>");
 #ifdef FEAT_CMDHIST
 	/* put pattern in search history */
+	init_history();
 	add_to_history(HIST_SEARCH, buf, TRUE, NUL);
 #endif
 	normal_search(cap, cmdchar == '*' ? '/' : '?', buf, 0);
diff --git a/src/version.c b/src/version.c
index 5aae1bb5..36ff3b6f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,12 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    323,
+/**/
+    322,
+/**/
+    321,
+/**/
     320,
 /**/
     319,
-- 
2.11.4.GIT