projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 90dbba45 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.3.032 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 6.3.032 | |
| 11 | Problem: Using Python 2.3 with threads doesn't work properly. | |
| 12 | Solution: Release the lock after initialization. | |
| 13 | Files: src/if_python.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-6.3.031/src/if_python.c Wed Jun 9 14:56:26 2004 | |
| 17 | --- src/if_python.c Thu Nov 18 10:01:02 2004 | |
| 18 | *************** | |
| 19 | *** 380,386 **** | |
| 20 | typedef PyObject PyThreadState; | |
| 21 | #endif /* Python 1.4 */ | |
| 22 | ||
| 23 | - #ifndef PY_CAN_RECURSE | |
| 24 | static PyThreadState* saved_python_thread = NULL; | |
| 25 | ||
| 26 | /* | |
| 27 | --- 380,385 ---- | |
| 28 | *************** | |
| 29 | *** 392,397 **** | |
| 30 | --- 391,397 ---- | |
| 31 | saved_python_thread = PyEval_SaveThread(); | |
| 32 | } | |
| 33 | ||
| 34 | + #ifndef PY_CAN_RECURSE | |
| 35 | /* | |
| 36 | * Restore a thread of the Python interpreter, waits for other threads to | |
| 37 | * block. | |
| 38 | *************** | |
| 39 | *** 456,465 **** | |
| 40 | if (PythonMod_Init()) | |
| 41 | goto fail; | |
| 42 | ||
| 43 | ! #ifndef PY_CAN_RECURSE | |
| 44 | ! /* the first python thread is vim's */ | |
| 45 | Python_SaveThread(); | |
| 46 | - #endif | |
| 47 | ||
| 48 | initialised = 1; | |
| 49 | } | |
| 50 | --- 456,463 ---- | |
| 51 | if (PythonMod_Init()) | |
| 52 | goto fail; | |
| 53 | ||
| 54 | ! /* the first python thread is vim's, release the lock */ | |
| 55 | Python_SaveThread(); | |
| 56 | ||
| 57 | initialised = 1; | |
| 58 | } | |
| 59 | *** ../vim-6.3.032/src/version.c Fri Oct 22 11:45:17 2004 | |
| 60 | --- src/version.c Thu Nov 18 10:43:17 2004 | |
| 61 | *************** | |
| 62 | *** 643,644 **** | |
| 63 | --- 643,646 ---- | |
| 64 | { /* Add new patch number below this line */ | |
| 65 | + /**/ | |
| 66 | + 32, | |
| 67 | /**/ | |
| 68 | ||
| 69 | ||
| 70 | -- | |
| 71 | GUARD #1: Where'd you get the coconut? | |
| 72 | ARTHUR: We found them. | |
| 73 | GUARD #1: Found them? In Mercea? The coconut's tropical! | |
| 74 | ARTHUR: What do you mean? | |
| 75 | GUARD #1: Well, this is a temperate zone. | |
| 76 | The Quest for the Holy Grail (Monty Python) | |
| 77 | ||
| 78 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 79 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 80 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 81 | \\\ Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html /// |