Mirror of the Vim source from https://github.com/vim/vim
Revisão | 45898756e0598f357776ae5aa05d717a7017e0cc (tree) |
---|---|
Hora | 2007-09-14 03:40:54 |
Autor | vimboss |
Commiter | vimboss |
updated for version 7.1-105
@@ -6746,20 +6746,24 @@ | ||
6746 | 6746 | clear_tv(&tvkey); |
6747 | 6747 | goto failret; |
6748 | 6748 | } |
6749 | - key = get_tv_string_buf_chk(&tvkey, buf); | |
6750 | - if (key == NULL || *key == NUL) | |
6751 | - { | |
6752 | - /* "key" is NULL when get_tv_string_buf_chk() gave an errmsg */ | |
6753 | - if (key != NULL) | |
6754 | - EMSG(_(e_emptykey)); | |
6755 | - clear_tv(&tvkey); | |
6756 | - goto failret; | |
6749 | + if (evaluate) | |
6750 | + { | |
6751 | + key = get_tv_string_buf_chk(&tvkey, buf); | |
6752 | + if (key == NULL || *key == NUL) | |
6753 | + { | |
6754 | + /* "key" is NULL when get_tv_string_buf_chk() gave an errmsg */ | |
6755 | + if (key != NULL) | |
6756 | + EMSG(_(e_emptykey)); | |
6757 | + clear_tv(&tvkey); | |
6758 | + goto failret; | |
6759 | + } | |
6757 | 6760 | } |
6758 | 6761 | |
6759 | 6762 | *arg = skipwhite(*arg + 1); |
6760 | 6763 | if (eval1(arg, &tv, evaluate) == FAIL) /* recursive! */ |
6761 | 6764 | { |
6762 | - clear_tv(&tvkey); | |
6765 | + if (evaluate) | |
6766 | + clear_tv(&tvkey); | |
6763 | 6767 | goto failret; |
6764 | 6768 | } |
6765 | 6769 | if (evaluate) |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 105, | |
671 | +/**/ | |
670 | 672 | 104, |
671 | 673 | /**/ |
672 | 674 | 103, |