projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| e7d66cb1 AM |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.436 | |
| 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.2.436 | |
| 11 | Problem: Reproducible crash in syntax HL. (George Reilly, Dominique Pelle) | |
| 12 | Solution: Make sst_stacksize an int instead of short. (Dominique Pelle) | |
| 13 | Files: src/structs.h | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.2.435/src/structs.h 2010-05-14 22:24:31.000000000 +0200 | |
| 17 | --- src/structs.h 2010-05-16 13:48:26.000000000 +0200 | |
| 18 | *************** | |
| 19 | *** 327,333 **** | |
| 20 | typedef struct m_info minfo_T; | |
| 21 | ||
| 22 | /* | |
| 23 | ! * stucture used to link chunks in one of the free chunk lists. | |
| 24 | */ | |
| 25 | struct m_info | |
| 26 | { | |
| 27 | --- 327,333 ---- | |
| 28 | typedef struct m_info minfo_T; | |
| 29 | ||
| 30 | /* | |
| 31 | ! * structure used to link chunks in one of the free chunk lists. | |
| 32 | */ | |
| 33 | struct m_info | |
| 34 | { | |
| 35 | *************** | |
| 36 | *** 795,803 **** | |
| 37 | garray_T sst_ga; /* growarray for long state stack */ | |
| 38 | } sst_union; | |
| 39 | int sst_next_flags; /* flags for sst_next_list */ | |
| 40 | short *sst_next_list; /* "nextgroup" list in this state | |
| 41 | * (this is a copy, don't free it! */ | |
| 42 | - short sst_stacksize; /* number of states on the stack */ | |
| 43 | disptick_T sst_tick; /* tick when last displayed */ | |
| 44 | linenr_T sst_change_lnum;/* when non-zero, change in this line | |
| 45 | * may have made the state invalid */ | |
| 46 | --- 795,803 ---- | |
| 47 | garray_T sst_ga; /* growarray for long state stack */ | |
| 48 | } sst_union; | |
| 49 | int sst_next_flags; /* flags for sst_next_list */ | |
| 50 | + int sst_stacksize; /* number of states on the stack */ | |
| 51 | short *sst_next_list; /* "nextgroup" list in this state | |
| 52 | * (this is a copy, don't free it! */ | |
| 53 | disptick_T sst_tick; /* tick when last displayed */ | |
| 54 | linenr_T sst_change_lnum;/* when non-zero, change in this line | |
| 55 | * may have made the state invalid */ | |
| 56 | *************** | |
| 57 | *** 2138,2144 **** | |
| 58 | #define SHAPE_IDX_CI 5 /* Command line Insert mode */ | |
| 59 | #define SHAPE_IDX_CR 6 /* Command line Replace mode */ | |
| 60 | #define SHAPE_IDX_O 7 /* Operator-pending mode */ | |
| 61 | ! #define SHAPE_IDX_VE 8 /* Visual mode with 'seleciton' exclusive */ | |
| 62 | #define SHAPE_IDX_CLINE 9 /* On command line */ | |
| 63 | #define SHAPE_IDX_STATUS 10 /* A status line */ | |
| 64 | #define SHAPE_IDX_SDRAG 11 /* dragging a status line */ | |
| 65 | --- 2138,2144 ---- | |
| 66 | #define SHAPE_IDX_CI 5 /* Command line Insert mode */ | |
| 67 | #define SHAPE_IDX_CR 6 /* Command line Replace mode */ | |
| 68 | #define SHAPE_IDX_O 7 /* Operator-pending mode */ | |
| 69 | ! #define SHAPE_IDX_VE 8 /* Visual mode with 'selection' exclusive */ | |
| 70 | #define SHAPE_IDX_CLINE 9 /* On command line */ | |
| 71 | #define SHAPE_IDX_STATUS 10 /* A status line */ | |
| 72 | #define SHAPE_IDX_SDRAG 11 /* dragging a status line */ | |
| 73 | *************** | |
| 74 | *** 2267,2273 **** | |
| 75 | /* short index; */ /* the item index within the father menu */ | |
| 76 | short menu_id; /* the menu id to which this item belong */ | |
| 77 | short submenu_id; /* the menu id of the children (could be | |
| 78 | ! get throught some tricks) */ | |
| 79 | MenuHandle menu_handle; | |
| 80 | MenuHandle submenu_handle; | |
| 81 | #endif | |
| 82 | --- 2267,2273 ---- | |
| 83 | /* short index; */ /* the item index within the father menu */ | |
| 84 | short menu_id; /* the menu id to which this item belong */ | |
| 85 | short submenu_id; /* the menu id of the children (could be | |
| 86 | ! get through some tricks) */ | |
| 87 | MenuHandle menu_handle; | |
| 88 | MenuHandle submenu_handle; | |
| 89 | #endif | |
| 90 | *** ../vim-7.2.435/src/version.c 2010-05-16 13:26:19.000000000 +0200 | |
| 91 | --- src/version.c 2010-05-16 13:54:30.000000000 +0200 | |
| 92 | *************** | |
| 93 | *** 683,684 **** | |
| 94 | --- 683,686 ---- | |
| 95 | { /* Add new patch number below this line */ | |
| 96 | + /**/ | |
| 97 | + 436, | |
| 98 | /**/ | |
| 99 | ||
| 100 | -- | |
| 101 | hundred-and-one symptoms of being an internet addict: | |
| 102 | 47. You are so familiar with the WWW that you find the search engines useless. | |
| 103 | ||
| 104 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 105 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 106 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 107 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |