diff options
author | Bram Moolenaar <bram@vim.org> | 2013-06-03 20:04:48 +0200 |
---|---|---|
committer | Bram Moolenaar <bram@vim.org> | 2013-06-03 20:04:48 +0200 |
commit | b63b50ac1e464fb7877d29b58696519878c9cbc7 (patch) | |
tree | f70476252f6f808bdb302eca63dee21468addaad | |
parent | 84d4acd4acf7bca7bb750712ed22dd46c06c531c (diff) | |
download | vim-b63b50ac1e464fb7877d29b58696519878c9cbc7.tar.gz |
Problem: Error message for os.fchdir() (Charles Peacech)
Solution: Clear the error. (ZyX)
-rw-r--r-- | src/if_py_both.h | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h index 99fdd80c..945efe60 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -5413,6 +5413,8 @@ populate_module(PyObject *m, object_adder add_object, attr_getter get_attr) if (PyObject_SetAttrString(os, "fchdir", get_attr(m, "fchdir"))) return -1; } + else + PyErr_Clear(); return 0; } diff --git a/src/version.c b/src/version.c index d9a3a88e..22d46c76 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 */ /**/ + 1108, +/**/ 1107, /**/ 1106, |