summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-05-29 22:58:32 +0200
committerBram Moolenaar <Bram@vim.org>2013-05-29 22:58:32 +0200
commit07b8864111362db1ce4f3fa30ba8460b8bf91774 (patch)
tree9a0f846caa64afaf86b6a45fe44e09652d7c1aed
parent1bcabe19a2be1a3fe324422e8c28db9e27715cb9 (diff)
downloadvim-git-07b8864111362db1ce4f3fa30ba8460b8bf91774.tar.gz
updated for version 7.3.1053v7.3.1053
Problem: Python: no flag for types with tp_traverse+tp_clear. Solution: Python patch 14: Add Py_TPFLAGS_HAVE_GC. (ZyX)
-rw-r--r--src/if_py_both.h8
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 4 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h
index 29d282076..088bc5e74 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -4461,7 +4461,7 @@ init_structs(void)
vim_memset(&IterType, 0, sizeof(IterType));
IterType.tp_name = "vim.iter";
IterType.tp_basicsize = sizeof(IterObject);
- IterType.tp_flags = Py_TPFLAGS_DEFAULT;
+ IterType.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_GC;
IterType.tp_doc = "generic iterator object";
IterType.tp_iter = (getiterfunc)IterIter;
IterType.tp_iternext = (iternextfunc)IterNext;
@@ -4495,7 +4495,7 @@ init_structs(void)
WindowType.tp_basicsize = sizeof(WindowObject);
WindowType.tp_dealloc = (destructor)WindowDestructor;
WindowType.tp_repr = (reprfunc)WindowRepr;
- WindowType.tp_flags = Py_TPFLAGS_DEFAULT;
+ WindowType.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_GC;
WindowType.tp_doc = "vim Window object";
WindowType.tp_methods = WindowMethods;
WindowType.tp_traverse = (traverseproc)WindowTraverse;
@@ -4558,7 +4558,7 @@ init_structs(void)
RangeType.tp_repr = (reprfunc)RangeRepr;
RangeType.tp_as_sequence = &RangeAsSeq;
RangeType.tp_as_mapping = &RangeAsMapping;
- RangeType.tp_flags = Py_TPFLAGS_DEFAULT;
+ RangeType.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_GC;
RangeType.tp_doc = "vim Range object";
RangeType.tp_methods = RangeMethods;
RangeType.tp_traverse = (traverseproc)RangeTraverse;
@@ -4637,7 +4637,7 @@ init_structs(void)
vim_memset(&OptionsType, 0, sizeof(OptionsType));
OptionsType.tp_name = "vim.options";
OptionsType.tp_basicsize = sizeof(OptionsObject);
- OptionsType.tp_flags = Py_TPFLAGS_DEFAULT;
+ OptionsType.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_GC;
OptionsType.tp_doc = "object for manipulating options";
OptionsType.tp_as_mapping = &OptionsAsMapping;
OptionsType.tp_dealloc = (destructor)OptionsDestructor;
diff --git a/src/version.c b/src/version.c
index 9209f60a1..c7785bab0 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 */
/**/
+ 1053,
+/**/
1052,
/**/
1051,