| Révision | f0b3b9ac2147350b1d1fd762cfda0b3073b0bca3 (tree) |
|---|---|
| l'heure | 2007-11-25 05:28:24 |
| Auteur | vimboss |
| Commiter | vimboss |
updated for version 7.1-161
src/edit.c (diff) src/misc2.c (diff) src/version.c (diff)| @@ -2236,7 +2236,7 @@ | ||
| 2236 | 2236 | while (i < actual_len && (p - IObuff + 6) < IOSIZE) |
| 2237 | 2237 | #ifdef FEAT_MBYTE |
| 2238 | 2238 | if (has_mbyte) |
| 2239 | - p += mb_char2bytes(wca[i++], p); | |
| 2239 | + p += (*mb_char2bytes)(wca[i++], p); | |
| 2240 | 2240 | else |
| 2241 | 2241 | #endif |
| 2242 | 2242 | *(p++) = wca[i++]; |
| @@ -6444,8 +6444,10 @@ | ||
| 6444 | 6444 | { |
| 6445 | 6445 | vim_free(last_insert); |
| 6446 | 6446 | last_insert = NULL; |
| 6447 | +# ifdef FEAT_INS_EXPAND | |
| 6447 | 6448 | vim_free(compl_orig_text); |
| 6448 | 6449 | compl_orig_text = NULL; |
| 6450 | +# endif | |
| 6449 | 6451 | } |
| 6450 | 6452 | #endif |
| 6451 | 6453 |
| @@ -964,7 +964,6 @@ | ||
| 964 | 964 | { |
| 965 | 965 | buf_T *buf, *nextbuf; |
| 966 | 966 | static int entered = FALSE; |
| 967 | - win_T *win; | |
| 968 | 967 | |
| 969 | 968 | /* When we cause a crash here it is caught and Vim tries to exit cleanly. |
| 970 | 969 | * Don't try freeing everything again. */ |
| @@ -972,15 +971,17 @@ | ||
| 972 | 971 | return; |
| 973 | 972 | entered = TRUE; |
| 974 | 973 | |
| 974 | +# ifdef FEAT_AUTOCMD | |
| 975 | 975 | block_autocmds(); /* don't want to trigger autocommands here */ |
| 976 | - | |
| 977 | -#ifdef FEAT_WINDOWS | |
| 976 | +# endif | |
| 977 | + | |
| 978 | +# ifdef FEAT_WINDOWS | |
| 978 | 979 | /* close all tabs and windows */ |
| 979 | 980 | if (first_tabpage->tp_next != NULL) |
| 980 | 981 | do_cmdline_cmd((char_u *)"tabonly!"); |
| 981 | 982 | if (firstwin != lastwin) |
| 982 | 983 | do_cmdline_cmd((char_u *)"only!"); |
| 983 | -#endif | |
| 984 | +# endif | |
| 984 | 985 | |
| 985 | 986 | # if defined(FEAT_SPELL) |
| 986 | 987 | /* Free all spell info. */ |
| @@ -1031,8 +1032,12 @@ | ||
| 1031 | 1032 | free_regexp_stuff(); |
| 1032 | 1033 | free_tag_stuff(); |
| 1033 | 1034 | free_cd_dir(); |
| 1035 | +# ifdef FEAT_EVAL | |
| 1034 | 1036 | set_expr_line(NULL); |
| 1037 | +# endif | |
| 1038 | +# ifdef FEAT_DIFF | |
| 1035 | 1039 | diff_clear(curtab); |
| 1040 | +# endif | |
| 1036 | 1041 | clear_sb_text(); /* free any scrollback text */ |
| 1037 | 1042 | |
| 1038 | 1043 | /* Free some global vars. */ |
| @@ -1041,19 +1046,27 @@ | ||
| 1041 | 1046 | vim_free(clip_exclude_prog); |
| 1042 | 1047 | # endif |
| 1043 | 1048 | vim_free(last_cmdline); |
| 1049 | +# ifdef FEAT_CMDHIST | |
| 1044 | 1050 | vim_free(new_last_cmdline); |
| 1051 | +# endif | |
| 1045 | 1052 | set_keep_msg(NULL, 0); |
| 1046 | 1053 | vim_free(ff_expand_buffer); |
| 1047 | 1054 | |
| 1048 | 1055 | /* Clear cmdline history. */ |
| 1049 | 1056 | p_hi = 0; |
| 1057 | +# ifdef FEAT_CMDHIST | |
| 1050 | 1058 | init_history(); |
| 1059 | +# endif | |
| 1051 | 1060 | |
| 1052 | 1061 | #ifdef FEAT_QUICKFIX |
| 1053 | - qf_free_all(NULL); | |
| 1054 | - /* Free all location lists */ | |
| 1055 | - FOR_ALL_WINDOWS(win) | |
| 1056 | - qf_free_all(win); | |
| 1062 | + { | |
| 1063 | + win_T *win; | |
| 1064 | + | |
| 1065 | + qf_free_all(NULL); | |
| 1066 | + /* Free all location lists */ | |
| 1067 | + FOR_ALL_WINDOWS(win) | |
| 1068 | + qf_free_all(win); | |
| 1069 | + } | |
| 1057 | 1070 | #endif |
| 1058 | 1071 | |
| 1059 | 1072 | /* Close all script inputs. */ |
| @@ -667,6 +667,8 @@ | ||
| 667 | 667 | static int included_patches[] = |
| 668 | 668 | { /* Add new patch number below this line */ |
| 669 | 669 | /**/ |
| 670 | + 161, | |
| 671 | +/**/ | |
| 670 | 672 | 160, |
| 671 | 673 | /**/ |
| 672 | 674 | 159, |
Vim
Fork