projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| c9e2e521 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.3.037 | |
| 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.037 (after 6.3.032) | |
| 11 | Problem: Warning for unused variable. | |
| 12 | Solution: Change the #ifdefs for the saved thread stuff. | |
| 13 | Files: src/if_python.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-6.3.036/src/if_python.c Thu Nov 18 10:24:49 2004 | |
| 17 | --- src/if_python.c Sat Dec 4 15:23:15 2004 | |
| 18 | *************** | |
| 19 | *** 380,402 **** | |
| 20 | typedef PyObject PyThreadState; | |
| 21 | #endif /* Python 1.4 */ | |
| 22 | ||
| 23 | ! static PyThreadState* saved_python_thread = NULL; | |
| 24 | ||
| 25 | /* | |
| 26 | * Suspend a thread of the Python interpreter, other threads are allowed to | |
| 27 | * run. | |
| 28 | */ | |
| 29 | ! static void Python_SaveThread(void) | |
| 30 | { | |
| 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 | ! static void Python_RestoreThread(void) | |
| 40 | { | |
| 41 | PyEval_RestoreThread(saved_python_thread); | |
| 42 | saved_python_thread = NULL; | |
| 43 | --- 380,404 ---- | |
| 44 | typedef PyObject PyThreadState; | |
| 45 | #endif /* Python 1.4 */ | |
| 46 | ||
| 47 | ! #ifndef PY_CAN_RECURSE | |
| 48 | ! static PyThreadState *saved_python_thread = NULL; | |
| 49 | ||
| 50 | /* | |
| 51 | * Suspend a thread of the Python interpreter, other threads are allowed to | |
| 52 | * run. | |
| 53 | */ | |
| 54 | ! static void | |
| 55 | ! Python_SaveThread(void) | |
| 56 | { | |
| 57 | saved_python_thread = PyEval_SaveThread(); | |
| 58 | } | |
| 59 | ||
| 60 | /* | |
| 61 | * Restore a thread of the Python interpreter, waits for other threads to | |
| 62 | * block. | |
| 63 | */ | |
| 64 | ! static void | |
| 65 | ! Python_RestoreThread(void) | |
| 66 | { | |
| 67 | PyEval_RestoreThread(saved_python_thread); | |
| 68 | saved_python_thread = NULL; | |
| 69 | *************** | |
| 70 | *** 457,463 **** | |
| 71 | --- 459,469 ---- | |
| 72 | goto fail; | |
| 73 | ||
| 74 | /* the first python thread is vim's, release the lock */ | |
| 75 | + #ifdef PY_CAN_RECURSE | |
| 76 | + PyEval_SaveThread(); | |
| 77 | + #else | |
| 78 | Python_SaveThread(); | |
| 79 | + #endif | |
| 80 | ||
| 81 | initialised = 1; | |
| 82 | } | |
| 83 | *** ../vim-6.3.036/src/version.c Sat Dec 4 14:55:39 2004 | |
| 84 | --- src/version.c Sat Dec 4 15:25:14 2004 | |
| 85 | *************** | |
| 86 | *** 643,644 **** | |
| 87 | --- 643,646 ---- | |
| 88 | { /* Add new patch number below this line */ | |
| 89 | + /**/ | |
| 90 | + 37, | |
| 91 | /**/ | |
| 92 | ||
| 93 | -- | |
| 94 | Scientists decoded the first message from an alien civilization: | |
| 95 | SIMPLY SEND 6 TIMES 10 TO THE 50 ATOMS OF HYDROGEN TO THE STAR | |
| 96 | SYSTEM AT THE TOP OF THE LIST, CROSS OFF THAT STAR SYSTEM, THEN PUT | |
| 97 | YOUR STAR SYSTEM AT THE BOTTOM OF THE LIST AND SEND IT TO 100 OTHER | |
| 98 | STAR SYSTEMS. WITHIN ONE TENTH GALACTIC ROTATION YOU WILL RECEIVE | |
| 99 | ENOUGH HYDROGREN TO POWER YOUR CIVILIZATION UNTIL ENTROPY REACHES ITS | |
| 100 | MAXIMUM! IT REALLY WORKS! | |
| 101 | ||
| 102 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 103 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 104 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 105 | \\\ Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html /// |