diff --git a/src/gui_w32.c b/src/gui_w32.c
index 8046a8d..3ecedde 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -498,6 +498,18 @@
 	_OnScroll(hwnd, hwndCtl, zDelta >= 0 ? SB_PAGEUP : SB_PAGEDOWN, 0);
 }
 
+/*
+ * Invoked when a setting was changed.
+ */
+    static LRESULT CALLBACK
+_OnSettingChange(UINT n)
+{
+    if (n == SPI_SETWHEELSCROLLLINES)
+	SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0,
+		&mouse_scroll_lines, 0);
+    return 0;
+}
+
 #if 0	/* disabled, a gap appears below and beside the window, and the window
 	   can be moved (in a strange way) */
 /*
@@ -686,6 +698,10 @@
 	_OnMouseWheel(hwnd, HIWORD(wParam));
 	break;
 
+	/* Notification for change in SystemParametersInfo() */
+    case WM_SETTINGCHANGE:
+	return _OnSettingChange((UINT)wParam);
+
 #ifdef FEAT_TOOLBAR
     case WM_NOTIFY:
 	switch (((LPNMHDR) lParam)->code)
diff --git a/src/proto/misc2.pro b/src/proto/misc2.pro
index 38d50a9..6d79631 100644
--- a/src/proto/misc2.pro
+++ b/src/proto/misc2.pro
@@ -94,4 +94,6 @@
 int pathcmp __ARGS((const char *p, const char *q, int maxlen));
 char_u *parse_list_options __ARGS((char_u *option_str, option_table_T *table, int table_size));
 int filewritable __ARGS((char_u *fname));
+int emsg3 __ARGS((char_u *s, char_u *a1, char_u *a2));
+int emsgn __ARGS((char_u *s, long n));
 /* vim: set ft=c : */
diff --git a/src/search.c b/src/search.c
index 9d29817..5370769 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2224,7 +2224,7 @@
 	    int instr = FALSE;	/* inside of string */
 
 	    p = line;		/* scan from start */
-	    while ((p = vim_strpbrk(p, "\";")) != NULL)
+	    while ((p = vim_strpbrk(p, (char_u *)"\";")) != NULL)
 	    {
 		if (*p == '"')
 		{
diff --git a/src/version.h b/src/version.h
index c9e81ea..3366bb1 100644
--- a/src/version.h
+++ b/src/version.h
@@ -36,5 +36,5 @@
 #define VIM_VERSION_NODOT	"vim70aa"
 #define VIM_VERSION_SHORT	"7.0aa"
 #define VIM_VERSION_MEDIUM	"7.0aa ALPHA"
-#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 14)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 14, compiled "
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 16)"
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 16, compiled "