Mirror of the Vim source from https://github.com/vim/vim
Revision | bca50c9e1374c176a63f9baf0ed7fcb34ea16967 (tree) |
---|---|
Time | 2007-10-31 01:37:15 |
Author | vimboss |
Commiter | vimboss |
updated for version 7.1-147
@@ -3353,6 +3353,7 @@ | ||
3353 | 3353 | char_u *ss = NULL; |
3354 | 3354 | static int findex; |
3355 | 3355 | static char_u *orig_save = NULL; /* kept value of orig */ |
3356 | + int orig_saved = FALSE; | |
3356 | 3357 | int i; |
3357 | 3358 | long_u len; |
3358 | 3359 | int non_suf_match; /* number without matching suffix */ |
@@ -3421,6 +3422,7 @@ | ||
3421 | 3422 | { |
3422 | 3423 | vim_free(orig_save); |
3423 | 3424 | orig_save = orig; |
3425 | + orig_saved = TRUE; | |
3424 | 3426 | |
3425 | 3427 | /* |
3426 | 3428 | * Do the expansion. |
@@ -3546,7 +3548,7 @@ | ||
3546 | 3548 | ExpandCleanup(xp); |
3547 | 3549 | |
3548 | 3550 | /* Free "orig" if it wasn't stored in "orig_save". */ |
3549 | - if (orig != orig_save) | |
3551 | + if (!orig_saved) | |
3550 | 3552 | vim_free(orig); |
3551 | 3553 | |
3552 | 3554 | return ss; |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 147, | |
671 | +/**/ | |
670 | 672 | 146, |
671 | 673 | /**/ |
672 | 674 | 145, |