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
commit6fa41fb3746e5ab2f793de713879afc9b1e25647 (patch)
tree2f3d6bc6c68a71bada269a01028b41e741d84875
parent7533fddd09bc9fe9d21c481cbe406c7f86119578 (diff)
downloadvim-git-6fa41fb3746e5ab2f793de713879afc9b1e25647.tar.gz
updated for version 7.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 76ea7137a..b897c0973 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 a51ca947c..41e77068f 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".
*/