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/.gitignore b/.gitignore
index 8bfd0ca7f2e69c69d0d4d03270a1feb4e6f43cf6..eff38a83ec9aa25bfb1274665bfe35ee004fe916 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,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
index 4f977c38c20be58756ed7ad2202d4e356c83af6b..d66e2cbd191e381ef9753360c1d98f5f18564604 100644 (file)
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -139,13 +139,15 @@ StringToChars(PyObject *obj, PyObject **todecref)
     }
     else
     {
-       PyErr_FORMAT(PyExc_TypeError,
 #if PY_MAJOR_VERSION < 3
-               N_("expected str() or unicode() instance, but got %s")
+       PyErr_FORMAT(PyExc_TypeError,
+               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, int flags)
     }
     else
     {
-       PyErr_FORMAT(PyExc_TypeError,
 #if PY_MAJOR_VERSION < 3
+       PyErr_FORMAT(PyExc_TypeError,
                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
index 9541472501aea52f0ad412dc61b878320ca16404..203daed52318645b500c28c3469e4e33427be71e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1239,
 /**/
     1238,
 /**/