projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| a2e11672 AG |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.232 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.3.232 | |
| 11 | Problem: Python doesn't compile without +multi_byte | |
| 12 | Solution: Use "latin1" when MULTI_BYTE is not defined. | |
| 13 | Files: src/if_py_both.h | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.231/src/if_py_both.h 2011-06-19 00:27:46.000000000 +0200 | |
| 17 | --- src/if_py_both.h 2011-06-26 03:58:07.000000000 +0200 | |
| 18 | *************** | |
| 19 | *** 12,17 **** | |
| 20 | --- 12,23 ---- | |
| 21 | * Common code for if_python.c and if_python3.c. | |
| 22 | */ | |
| 23 | ||
| 24 | + #ifdef FEAT_MBYTE | |
| 25 | + # define ENC_OPT p_enc | |
| 26 | + #else | |
| 27 | + # define ENC_OPT "latin1" | |
| 28 | + #endif | |
| 29 | + | |
| 30 | /* | |
| 31 | * obtain a lock on the Vim data structures | |
| 32 | */ | |
| 33 | *************** | |
| 34 | *** 68,74 **** | |
| 35 | char *str = NULL; | |
| 36 | int error = ((OutputObject *)(self))->error; | |
| 37 | ||
| 38 | ! if (!PyArg_ParseTuple(args, "es#", p_enc, &str, &len)) | |
| 39 | return NULL; | |
| 40 | ||
| 41 | Py_BEGIN_ALLOW_THREADS | |
| 42 | --- 74,80 ---- | |
| 43 | char *str = NULL; | |
| 44 | int error = ((OutputObject *)(self))->error; | |
| 45 | ||
| 46 | ! if (!PyArg_ParseTuple(args, "es#", ENC_OPT, &str, &len)) | |
| 47 | return NULL; | |
| 48 | ||
| 49 | Py_BEGIN_ALLOW_THREADS | |
| 50 | *************** | |
| 51 | *** 108,114 **** | |
| 52 | char *str = NULL; | |
| 53 | PyInt len; | |
| 54 | ||
| 55 | ! if (!PyArg_Parse(line, "es#", p_enc, &str, &len)) { | |
| 56 | PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings")); | |
| 57 | Py_DECREF(list); | |
| 58 | return NULL; | |
| 59 | --- 114,120 ---- | |
| 60 | char *str = NULL; | |
| 61 | PyInt len; | |
| 62 | ||
| 63 | ! if (!PyArg_Parse(line, "es#", ENC_OPT, &str, &len)) { | |
| 64 | PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings")); | |
| 65 | Py_DECREF(list); | |
| 66 | return NULL; | |
| 67 | *** ../vim-7.3.231/src/version.c 2011-06-26 03:16:58.000000000 +0200 | |
| 68 | --- src/version.c 2011-06-26 04:00:40.000000000 +0200 | |
| 69 | *************** | |
| 70 | *** 711,712 **** | |
| 71 | --- 711,714 ---- | |
| 72 | { /* Add new patch number below this line */ | |
| 73 | + /**/ | |
| 74 | + 232, | |
| 75 | /**/ | |
| 76 | ||
| 77 | -- | |
| 78 | If evolution theories are correct, humans will soon grow a third | |
| 79 | hand for operating the mouse. | |
| 80 | ||
| 81 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 82 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 83 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 84 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |