projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| ba6abda2 ER |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.144 | |
| 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.144 | |
| 11 | Problem: Crash with ":python help(dir)". (Kearn Holliday) | |
| 12 | Solution: Fix the way the type is set on objects. (Tobias Columbus) | |
| 13 | Files: src/if_python.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.143/src/if_python.c 2010-11-16 19:25:56.000000000 +0100 | |
| 17 | --- src/if_python.c 2011-03-26 13:54:22.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 780,786 **** | |
| 20 | PythonIO_Init(void) | |
| 21 | { | |
| 22 | /* Fixups... */ | |
| 23 | ! OutputType.ob_type = &PyType_Type; | |
| 24 | ||
| 25 | return PythonIO_Init_io(); | |
| 26 | } | |
| 27 | --- 780,786 ---- | |
| 28 | PythonIO_Init(void) | |
| 29 | { | |
| 30 | /* Fixups... */ | |
| 31 | ! PyType_Ready(&OutputType); | |
| 32 | ||
| 33 | return PythonIO_Init_io(); | |
| 34 | } | |
| 35 | *************** | |
| 36 | *** 1402,1413 **** | |
| 37 | static char *(argv[2]) = {"/must>not&exist/foo", NULL}; | |
| 38 | ||
| 39 | /* Fixups... */ | |
| 40 | ! BufferType.ob_type = &PyType_Type; | |
| 41 | ! RangeType.ob_type = &PyType_Type; | |
| 42 | ! WindowType.ob_type = &PyType_Type; | |
| 43 | ! BufListType.ob_type = &PyType_Type; | |
| 44 | ! WinListType.ob_type = &PyType_Type; | |
| 45 | ! CurrentType.ob_type = &PyType_Type; | |
| 46 | ||
| 47 | /* Set sys.argv[] to avoid a crash in warn(). */ | |
| 48 | PySys_SetArgv(1, argv); | |
| 49 | --- 1402,1413 ---- | |
| 50 | static char *(argv[2]) = {"/must>not&exist/foo", NULL}; | |
| 51 | ||
| 52 | /* Fixups... */ | |
| 53 | ! PyType_Ready(&BufferType); | |
| 54 | ! PyType_Ready(&RangeType); | |
| 55 | ! PyType_Ready(&WindowType); | |
| 56 | ! PyType_Ready(&BufListType); | |
| 57 | ! PyType_Ready(&WinListType); | |
| 58 | ! PyType_Ready(&CurrentType); | |
| 59 | ||
| 60 | /* Set sys.argv[] to avoid a crash in warn(). */ | |
| 61 | PySys_SetArgv(1, argv); | |
| 62 | *** ../vim-7.3.143/src/version.c 2011-03-22 18:10:34.000000000 +0100 | |
| 63 | --- src/version.c 2011-03-26 13:56:15.000000000 +0100 | |
| 64 | *************** | |
| 65 | *** 716,717 **** | |
| 66 | --- 716,719 ---- | |
| 67 | { /* Add new patch number below this line */ | |
| 68 | + /**/ | |
| 69 | + 144, | |
| 70 | /**/ | |
| 71 | ||
| 72 | -- | |
| 73 | The chat program is in public domain. This is not the GNU public license. | |
| 74 | If it breaks then you get to keep both pieces. | |
| 75 | -- Copyright notice for the chat program | |
| 76 | ||
| 77 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 78 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 79 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 80 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |