diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 462232f..e1e6c4e 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -2743,7 +2743,7 @@
 	}
 	if (buf == NULL)
 	    goto theend;
-	// autocommands try to edit a file that is goind to be removed,
+	// autocommands try to edit a file that is going to be removed,
 	// abort
 	if (buf_locked(buf))
 	{
diff --git a/src/po/Make_mvc.mak b/src/po/Make_mvc.mak
index f567d88..de03397 100644
--- a/src/po/Make_mvc.mak
+++ b/src/po/Make_mvc.mak
@@ -38,7 +38,7 @@
 !ENDIF
 
 PACKAGE = vim
-# Correct the following line for the where executeable file vim is
+# Correct the following line for the where executable file vim is
 # installed.  Please do not put the path in quotes.
 !IFNDEF VIMPROG
 VIMPROG = ..\vim.exe
diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim
index a654b6d..bed795e 100644
--- a/src/testdir/test_diffmode.vim
+++ b/src/testdir/test_diffmode.vim
Binary files differ
diff --git a/src/version.c b/src/version.c
index 2839e89..7906b07 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    849,
+/**/
     848,
 /**/
     847,