# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1372101718 -7200
# Node ID e130cc3d17af412971143b8420d6e7b1cbd13ff2
# Parent  9429c1cbd9d4cbe398880ef282a107b16512488b
updated for version 7.3.1239
Problem:    Can't build with Python and MSVC10.
Solution:   Move #if outside of macro. (Taro Muraoka)

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -38,6 +38,9 @@ src/Obj*/pathdef.c
 gvimext.dll
 gvimext.lib
 
+# Mac OSX
+src/xxd/xxd.dSYM
+
 # All platforms
 *.rej
 *.orig
diff --git a/src/if_py_both.h b/src/if_py_both.h
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -139,13 +139,15 @@ StringToChars(PyObject *obj, PyObject **
     }
     else
     {
+#if PY_MAJOR_VERSION < 3
 	PyErr_FORMAT(PyExc_TypeError,
-#if PY_MAJOR_VERSION < 3
-		N_("expected str() or unicode() instance, but got %s")
+		N_("expected str() or unicode() instance, but got %s"),
+		Py_TYPE_NAME(obj));
 #else
-		N_("expected bytes() or str() instance, but got %s")
+	PyErr_FORMAT(PyExc_TypeError,
+		N_("expected bytes() or str() instance, but got %s"),
+		Py_TYPE_NAME(obj));
 #endif
-		, Py_TYPE_NAME(obj));
 	return NULL;
     }
 
@@ -191,15 +193,17 @@ NumberToLong(PyObject *obj, long *result
     }
     else
     {
+#if PY_MAJOR_VERSION < 3
 	PyErr_FORMAT(PyExc_TypeError,
-#if PY_MAJOR_VERSION < 3
 		N_("expected int(), long() or something supporting "
-		   "coercing to long(), but got %s")
+		   "coercing to long(), but got %s"),
+		Py_TYPE_NAME(obj));
 #else
+	PyErr_FORMAT(PyExc_TypeError,
 		N_("expected int() or something supporting coercing to int(), "
-		   "but got %s")
+		   "but got %s"),
+		Py_TYPE_NAME(obj));
 #endif
-		, Py_TYPE_NAME(obj));
 	return -1;
     }
 
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1239,
+/**/
     1238,
 /**/
     1237,