diff options
| author | Bram Moolenaar <Bram@vim.org> | 2005-09-30 21:20:29 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2005-09-30 21:20:29 +0000 |
| commit | c54b8a78fad3cf726bd554c32c1d154ce2ecd936 (patch) | |
| tree | f553a7ab3d218d0793b4ecba791724b2952dc45c /src | |
| parent | f25fd51b89bb31e8adb9ad055ec0b617ee9d319e (diff) | |
| download | vim-c54b8a78fad3cf726bd554c32c1d154ce2ecd936.zip | |
updated for version 7.0152
Diffstat (limited to 'src')
| -rw-r--r-- | src/edit.c | 1 | ||||
| -rw-r--r-- | src/gui_w32.c | 12 | ||||
| -rw-r--r-- | src/proto/spell.pro | 1 | ||||
| -rw-r--r-- | src/version.h | 4 |
4 files changed, 11 insertions, 7 deletions
diff --git a/src/edit.c b/src/edit.c index d9bfb2fb0..e4370fcc2 100644 --- a/src/edit.c +++ b/src/edit.c @@ -3515,6 +3515,7 @@ ins_complete(c) compl_col = spell_word_start(startcol); if (compl_col >= (colnr_T)startcol) return FAIL; + spell_expand_check_cap(compl_col); compl_length = (int)curs_col - compl_col; compl_pattern = vim_strnsave(line + compl_col, compl_length); if (compl_pattern == NULL) diff --git a/src/gui_w32.c b/src/gui_w32.c index 6ff5fc649..c5d1eb009 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -1971,7 +1971,9 @@ gui_mch_draw_string( vim_free(padding); pad_size = Columns; - padding = (int *)alloc(pad_size * sizeof(int)); + /* Don't give an out-of-memory message here, it would call us + * recursively. */ + padding = (int *)lalloc(pad_size * sizeof(int), FALSE); if (padding != NULL) for (i = 0; i < pad_size; i++) padding[i] = gui.char_width; @@ -2007,10 +2009,10 @@ gui_mch_draw_string( && (unicodebuf == NULL || len > unibuflen)) { vim_free(unicodebuf); - unicodebuf = (WCHAR *)alloc(len * sizeof(WCHAR)); + unicodebuf = (WCHAR *)lalloc(len * sizeof(WCHAR), FALSE); vim_free(unicodepdy); - unicodepdy = (int *)alloc(len * sizeof(int)); + unicodepdy = (int *)lalloc(len * sizeof(int), FALSE); unibuflen = len; } @@ -2730,12 +2732,12 @@ gui_mch_dialog( dfltbutton = -1; /* Allocate array to hold the width of each button */ - buttonWidths = (int *) lalloc(numButtons * sizeof(int), TRUE); + buttonWidths = (int *)lalloc(numButtons * sizeof(int), TRUE); if (buttonWidths == NULL) return -1; /* Allocate array to hold the X position of each button */ - buttonPositions = (int *) lalloc(numButtons * sizeof(int), TRUE); + buttonPositions = (int *)lalloc(numButtons * sizeof(int), TRUE); if (buttonPositions == NULL) return -1; diff --git a/src/proto/spell.pro b/src/proto/spell.pro index facbfbc76..87261a244 100644 --- a/src/proto/spell.pro +++ b/src/proto/spell.pro @@ -19,5 +19,6 @@ char_u *eval_soundfold __ARGS((char_u *word)); void ex_spelldump __ARGS((exarg_T *eap)); char_u *spell_to_word_end __ARGS((char_u *start, buf_T *buf)); int spell_word_start __ARGS((int startcol)); +void spell_expand_check_cap __ARGS((colnr_T col)); int expand_spelling __ARGS((linenr_T lnum, int col, char_u *pat, char_u ***matchp)); /* vim: set ft=c : */ diff --git a/src/version.h b/src/version.h index 70e2f4d3e..85bf690b5 100644 --- a/src/version.h +++ b/src/version.h @@ -36,5 +36,5 @@ #define VIM_VERSION_NODOT "vim70aa" #define VIM_VERSION_SHORT "7.0aa" #define VIM_VERSION_MEDIUM "7.0aa ALPHA" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Sep 29)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Sep 29, compiled " +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Sep 30)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Sep 30, compiled " |