adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated for version 7.1-161

Browse Source
This commit is contained in:
Bram Moolenaar
2007-11-24 20:28:24 +00:00
parent 9f10875ed0
commit e0ca7b2b04
3 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/edit.c
View File

@ -2236,7 +2236,7 @@ ins_compl_add_infercase(str, len, icase, fname, dir, flags)
while (i < actual_len && (p - IObuff + 6) < IOSIZE) while (i < actual_len && (p - IObuff + 6) < IOSIZE)
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
if (has_mbyte) if (has_mbyte)
p += mb_char2bytes(wca[i++], p); p += (*mb_char2bytes)(wca[i++], p);
else else
#endif #endif
*(p++) = wca[i++]; *(p++) = wca[i++];
@ -6444,8 +6444,10 @@ free_last_insert()
{ {
vim_free(last_insert); vim_free(last_insert);
last_insert = NULL; last_insert = NULL;
# ifdef FEAT_INS_EXPAND
vim_free(compl_orig_text); vim_free(compl_orig_text);
compl_orig_text = NULL; compl_orig_text = NULL;
# endif
} }
#endif #endif

19
src/misc2.c
View File

@ -964,7 +964,6 @@ free_all_mem()
{ {
buf_T *buf, *nextbuf; buf_T *buf, *nextbuf;
static int entered = FALSE; static int entered = FALSE;
win_T *win;
/* When we cause a crash here it is caught and Vim tries to exit cleanly. /* When we cause a crash here it is caught and Vim tries to exit cleanly.
* Don't try freeing everything again. */ * Don't try freeing everything again. */
@ -972,15 +971,17 @@ free_all_mem()
return; return;
entered = TRUE; entered = TRUE;
# ifdef FEAT_AUTOCMD
block_autocmds(); /* don't want to trigger autocommands here */ block_autocmds(); /* don't want to trigger autocommands here */
# endif
#ifdef FEAT_WINDOWS # ifdef FEAT_WINDOWS
/* close all tabs and windows */ /* close all tabs and windows */
if (first_tabpage->tp_next != NULL) if (first_tabpage->tp_next != NULL)
do_cmdline_cmd((char_u *)"tabonly!"); do_cmdline_cmd((char_u *)"tabonly!");
if (firstwin != lastwin) if (firstwin != lastwin)
do_cmdline_cmd((char_u *)"only!"); do_cmdline_cmd((char_u *)"only!");
#endif # endif
# if defined(FEAT_SPELL) # if defined(FEAT_SPELL)
/* Free all spell info. */ /* Free all spell info. */
@ -1031,8 +1032,12 @@ free_all_mem()
free_regexp_stuff(); free_regexp_stuff();
free_tag_stuff(); free_tag_stuff();
free_cd_dir(); free_cd_dir();
# ifdef FEAT_EVAL
set_expr_line(NULL); set_expr_line(NULL);
# endif
# ifdef FEAT_DIFF
diff_clear(curtab); diff_clear(curtab);
# endif
clear_sb_text(); /* free any scrollback text */ clear_sb_text(); /* free any scrollback text */
/* Free some global vars. */ /* Free some global vars. */
@ -1041,19 +1046,27 @@ free_all_mem()
vim_free(clip_exclude_prog); vim_free(clip_exclude_prog);
# endif # endif
vim_free(last_cmdline); vim_free(last_cmdline);
# ifdef FEAT_CMDHIST
vim_free(new_last_cmdline); vim_free(new_last_cmdline);
# endif
set_keep_msg(NULL, 0); set_keep_msg(NULL, 0);
vim_free(ff_expand_buffer); vim_free(ff_expand_buffer);
/* Clear cmdline history. */ /* Clear cmdline history. */
p_hi = 0; p_hi = 0;
# ifdef FEAT_CMDHIST
init_history(); init_history();
# endif
#ifdef FEAT_QUICKFIX #ifdef FEAT_QUICKFIX
{
win_T *win;
qf_free_all(NULL); qf_free_all(NULL);
/* Free all location lists */ /* Free all location lists */
FOR_ALL_WINDOWS(win) FOR_ALL_WINDOWS(win)
qf_free_all(win); qf_free_all(win);
}
#endif #endif
/* Close all script inputs. */ /* Close all script inputs. */

2
src/version.c
View File

@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
161,
/**/ /**/
160, 160,
/**/ /**/