projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| a2e11672 AG |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.236 | |
| 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.236 (after 7.3.232) | |
| 11 | Problem: Python 3 doesn't compile without +multi_byte | |
| 12 | Solution: Use "latin1" when MULTI_BYTE is not defined. (lilydjwg) | |
| 13 | Files: src/if_python3.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.235/src/if_python3.c 2011-06-19 00:27:46.000000000 +0200 | |
| 17 | --- src/if_python3.c 2011-06-26 19:10:57.000000000 +0200 | |
| 18 | *************** | |
| 19 | *** 70,76 **** | |
| 20 | ||
| 21 | #define PyInt Py_ssize_t | |
| 22 | #define PyString_Check(obj) PyUnicode_Check(obj) | |
| 23 | ! #define PyString_AsBytes(obj) PyUnicode_AsEncodedString(obj, (char *)p_enc, NULL); | |
| 24 | #define PyString_FreeBytes(obj) Py_XDECREF(bytes) | |
| 25 | #define PyString_AsString(obj) PyBytes_AsString(obj) | |
| 26 | #define PyString_Size(obj) PyBytes_GET_SIZE(bytes) | |
| 27 | --- 70,76 ---- | |
| 28 | ||
| 29 | #define PyInt Py_ssize_t | |
| 30 | #define PyString_Check(obj) PyUnicode_Check(obj) | |
| 31 | ! #define PyString_AsBytes(obj) PyUnicode_AsEncodedString(obj, (char *)ENC_OPT, NULL); | |
| 32 | #define PyString_FreeBytes(obj) Py_XDECREF(bytes) | |
| 33 | #define PyString_AsString(obj) PyBytes_AsString(obj) | |
| 34 | #define PyString_Size(obj) PyBytes_GET_SIZE(bytes) | |
| 35 | *************** | |
| 36 | *** 661,667 **** | |
| 37 | ||
| 38 | /* PyRun_SimpleString expects a UTF-8 string. Wrong encoding may cause | |
| 39 | * SyntaxError (unicode error). */ | |
| 40 | ! cmdstr = PyUnicode_Decode(cmd, strlen(cmd), (char *)p_enc, NULL); | |
| 41 | cmdbytes = PyUnicode_AsEncodedString(cmdstr, "utf-8", NULL); | |
| 42 | Py_XDECREF(cmdstr); | |
| 43 | PyRun_SimpleString(PyBytes_AsString(cmdbytes)); | |
| 44 | --- 661,667 ---- | |
| 45 | ||
| 46 | /* PyRun_SimpleString expects a UTF-8 string. Wrong encoding may cause | |
| 47 | * SyntaxError (unicode error). */ | |
| 48 | ! cmdstr = PyUnicode_Decode(cmd, strlen(cmd), (char *)ENC_OPT, NULL); | |
| 49 | cmdbytes = PyUnicode_AsEncodedString(cmdstr, "utf-8", NULL); | |
| 50 | Py_XDECREF(cmdstr); | |
| 51 | PyRun_SimpleString(PyBytes_AsString(cmdbytes)); | |
| 52 | *************** | |
| 53 | *** 1463,1469 **** | |
| 54 | } | |
| 55 | *p = '\0'; | |
| 56 | ||
| 57 | ! result = PyUnicode_Decode(tmp, len, (char *)p_enc, NULL); | |
| 58 | ||
| 59 | vim_free(tmp); | |
| 60 | return result; | |
| 61 | --- 1463,1469 ---- | |
| 62 | } | |
| 63 | *p = '\0'; | |
| 64 | ||
| 65 | ! result = PyUnicode_Decode(tmp, len, (char *)ENC_OPT, NULL); | |
| 66 | ||
| 67 | vim_free(tmp); | |
| 68 | return result; | |
| 69 | *** ../vim-7.3.235/src/version.c 2011-06-26 05:36:07.000000000 +0200 | |
| 70 | --- src/version.c 2011-06-26 19:12:12.000000000 +0200 | |
| 71 | *************** | |
| 72 | *** 711,712 **** | |
| 73 | --- 711,714 ---- | |
| 74 | { /* Add new patch number below this line */ | |
| 75 | + /**/ | |
| 76 | + 236, | |
| 77 | /**/ | |
| 78 | ||
| 79 | -- | |
| 80 | hundred-and-one symptoms of being an internet addict: | |
| 81 | 228. You spend Saturday night making the counter on your home page | |
| 82 | pass that 2000 mark. | |
| 83 | ||
| 84 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 85 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 86 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 87 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |