From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 5 Jun 2013 18:34:15 +0000 (+0200)
Subject: updated for version 7.3.1124
X-Git-Tag: v7.3.1124
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d4209d203ac77e8c9debcc152557d80b4357aaae;p=thirdparty%2Fvim.git

updated for version 7.3.1124
Problem:    Python: Crash on MS-Windows when os.fchdir() is not available.
Solution:   Check for _chdir to be NULL. (Ken Takata)
---

diff --git a/src/if_py_both.h b/src/if_py_both.h
index 945efe60b6..ae2c6bc968 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -718,6 +718,8 @@ _VimChdir(PyObject *_chdir, PyObject *args, PyObject *kwargs)
     PyObject	*todecref;
     char_u	*new_dir;
 
+    if (_chdir == NULL)
+	return NULL;
     if (!(r = PyObject_Call(_chdir, args, kwargs)))
 	return NULL;
 
diff --git a/src/version.c b/src/version.c
index cfe0b22bf4..40f3df8617 100644
--- 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 */
+/**/
+    1124,
 /**/
     1123,
 /**/