summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-05-18 20:55:35 +0200
committerBram Moolenaar <bram@vim.org>2013-05-18 20:55:35 +0200
commit5e5bda4d9caf5b0fddb06cd3709857485dbb9063 (patch)
tree219604c7add6f7424c6394bb1f33684543c2330f
parent8929f2146fc916825810871297ffbedb46b655c8 (diff)
downloadvim-5e5bda4d9caf5b0fddb06cd3709857485dbb9063.tar.gz
updated for version 7.3.969v7.3.969v7-3-969
Problem: Can't built with Python 3 and without Python 2. Solution: Adjust #ifdef. (Xavier de Gaye)
-rw-r--r--src/version.c2
-rw-r--r--src/window.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index 76ea7137..b897c097 100644
--- 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 */
/**/
+ 969,
+/**/
968,
/**/
967,
diff --git a/src/window.c b/src/window.c
index a51ca947..41e77068 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4058,7 +4058,8 @@ win_find_nr(winnr)
}
#endif
-#if (defined(FEAT_WINDOWS) && defined(FEAT_PYTHON)) || defined(PROTO)
+#if (defined(FEAT_WINDOWS) && (defined(FEAT_PYTHON) || defined(FEAT_PYTHON3))) \
+ || defined(PROTO)
/*
* Find the tabpage for window "win".
*/