projects / people / arne_f / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| c6060300 MT |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.132 | |
| 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.132 | |
| 11 | Problem: C++ style comments. | |
| 12 | Solution: Change to C comments. | |
| 13 | Files: src/if_python3.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.131/src/if_python3.c 2010-11-16 19:25:56.000000000 +0100 | |
| 17 | --- src/if_python3.c 2011-01-16 01:28:35.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 22,29 **** | |
| 20 | * Adaptations to support both python3.x and python2.x | |
| 21 | */ | |
| 22 | ||
| 23 | ! // uncomment this if used with the debug version of python | |
| 24 | ! // #define Py_DEBUG | |
| 25 | ||
| 26 | #include "vim.h" | |
| 27 | ||
| 28 | --- 22,29 ---- | |
| 29 | * Adaptations to support both python3.x and python2.x | |
| 30 | */ | |
| 31 | ||
| 32 | ! /* uncomment this if used with the debug version of python */ | |
| 33 | ! /* #define Py_DEBUG */ | |
| 34 | ||
| 35 | #include "vim.h" | |
| 36 | ||
| 37 | *************** | |
| 38 | *** 74,80 **** | |
| 39 | #define PyString_Size(obj) PyUnicode_GET_SIZE(obj) | |
| 40 | #define PyString_FromString(repr) PyUnicode_FromString(repr) | |
| 41 | ||
| 42 | ! #if defined(DYNAMIC_PYTHON3) | |
| 43 | ||
| 44 | # ifndef WIN3264 | |
| 45 | # include <dlfcn.h> | |
| 46 | --- 74,80 ---- | |
| 47 | #define PyString_Size(obj) PyUnicode_GET_SIZE(obj) | |
| 48 | #define PyString_FromString(repr) PyUnicode_FromString(repr) | |
| 49 | ||
| 50 | ! #if defined(DYNAMIC_PYTHON3) || defined(PROTO) | |
| 51 | ||
| 52 | # ifndef WIN3264 | |
| 53 | # include <dlfcn.h> | |
| 54 | *** ../vim-7.3.131/src/version.c 2011-02-25 15:17:14.000000000 +0100 | |
| 55 | --- src/version.c 2011-02-25 15:18:18.000000000 +0100 | |
| 56 | *************** | |
| 57 | *** 716,717 **** | |
| 58 | --- 716,719 ---- | |
| 59 | { /* Add new patch number below this line */ | |
| 60 | + /**/ | |
| 61 | + 132, | |
| 62 | /**/ | |
| 63 | ||
| 64 | -- | |
| 65 | ** Hello and Welcome to the Psychiatric Hotline ** | |
| 66 | If you are obsessive-compulsive, please press 1 repeatedly. | |
| 67 | If you are co-dependent, please ask someone to press 2. | |
| 68 | If you have multiple personalities, please press 3, 4, 5 and 6. | |
| 69 | If you are paranoid-delusional, we know who you are and what you want | |
| 70 | - just stay on the line so we can trace the call. | |
| 71 | If you are schizophrenic, listen carefully and a little voice will | |
| 72 | tell you which number to press next. | |
| 73 | If you are manic-depressive, it doesn't matter which number you press | |
| 74 | - no one will answer. | |
| 75 | If you suffer from panic attacks, push every button you can find. | |
| 76 | If you are sane, please hold on - we have the rest of humanity on the | |
| 77 | other line and they desparately want to ask you a few questions. | |
| 78 | ||
| 79 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 80 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 81 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 82 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |