From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 18 May 2013 18:55:35 +0000 (+0200)
Subject: updated for version 7.3.969
X-Git-Tag: v7.3.969
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6fa41fb3746e5ab2f793de713879afc9b1e25647;p=vim

updated for version 7.3.969
Problem:    Can't built with Python 3 and without Python 2.
Solution:   Adjust #ifdef. (Xavier de Gaye)
---

diff --git a/src/version.c b/src/version.c
index 76ea7137a..b897c0973 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 */
+/**/
+    969,
 /**/
     968,
 /**/
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".
  */