diff options
author | Bram Moolenaar <Bram@vim.org> | 2010-05-16 13:56:06 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2010-05-16 13:56:06 +0200 |
commit | 8ce55d13c48f0ab35e566e184de8668c669a9f3b (patch) | |
tree | e884dfed5d2b4000d689213aaaff170e81397b60 | |
parent | 281798deab1d004926b02a8aa902889e287acd12 (diff) |
updated for version 7.2.436v7.2.436
Problem: Reproducible crash in syntax HL. (George Reilly, Dominique Pelle)
Solution: Make sst_stacksize an int instead of short. (Dominique Pelle)
-rw-r--r-- | src/structs.h | 8 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/structs.h b/src/structs.h index 87bfbaef58..d434bfee45 100644 --- a/src/structs.h +++ b/src/structs.h @@ -327,7 +327,7 @@ struct u_header typedef struct m_info minfo_T; /* - * stucture used to link chunks in one of the free chunk lists. + * structure used to link chunks in one of the free chunk lists. */ struct m_info { @@ -795,9 +795,9 @@ struct syn_state garray_T sst_ga; /* growarray for long state stack */ } sst_union; int sst_next_flags; /* flags for sst_next_list */ + int sst_stacksize; /* number of states on the stack */ short *sst_next_list; /* "nextgroup" list in this state * (this is a copy, don't free it! */ - short sst_stacksize; /* number of states on the stack */ disptick_T sst_tick; /* tick when last displayed */ linenr_T sst_change_lnum;/* when non-zero, change in this line * may have made the state invalid */ @@ -2138,7 +2138,7 @@ typedef struct cmdarg_S #define SHAPE_IDX_CI 5 /* Command line Insert mode */ #define SHAPE_IDX_CR 6 /* Command line Replace mode */ #define SHAPE_IDX_O 7 /* Operator-pending mode */ -#define SHAPE_IDX_VE 8 /* Visual mode with 'seleciton' exclusive */ +#define SHAPE_IDX_VE 8 /* Visual mode with 'selection' exclusive */ #define SHAPE_IDX_CLINE 9 /* On command line */ #define SHAPE_IDX_STATUS 10 /* A status line */ #define SHAPE_IDX_SDRAG 11 /* dragging a status line */ @@ -2267,7 +2267,7 @@ struct VimMenu /* short index; */ /* the item index within the father menu */ short menu_id; /* the menu id to which this item belong */ short submenu_id; /* the menu id of the children (could be - get throught some tricks) */ + get through some tricks) */ MenuHandle menu_handle; MenuHandle submenu_handle; #endif diff --git a/src/version.c b/src/version.c index 84a3a1dde5..103e043dc1 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 436, +/**/ 435, /**/ 434, |