Mercurial > vim
changeset 582:6a04259f5e0d
updated for version 7.0165
| author | vimboss |
|---|---|
| date | Thu, 08 Dec 2005 22:02:51 +0000 |
| parents | ec04f19aed55 |
| children | 39ebe9e88854 |
| files | src/option.c src/version.h |
| diffstat | 2 files changed, 17 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/option.c +++ b/src/option.c @@ -6530,21 +6530,24 @@ compile_cap_prog(buf) buf_T *buf; { regprog_T *rp = buf->b_cap_prog; + char_u *re; if (*buf->b_p_spc == NUL) - { buf->b_cap_prog = NULL; - vim_free(rp); - return NULL; - } - - /* Prepend a ^ so that we only match at one column */ - vim_snprintf((char *)IObuff, IOSIZE, "^%s", buf->b_p_spc); - buf->b_cap_prog = vim_regcomp(IObuff, RE_MAGIC); - if (buf->b_cap_prog == NULL) - { - buf->b_cap_prog = rp; - return e_invarg; + else + { + /* Prepend a ^ so that we only match at one column */ + re = concat_str((char_u *)"^", buf->b_p_spc); + if (re != NULL) + { + buf->b_cap_prog = vim_regcomp(re, RE_MAGIC); + if (buf->b_cap_prog == NULL) + { + buf->b_cap_prog = rp; /* restore the previous program */ + return e_invarg; + } + vim_free(re); + } } vim_free(rp);
--- 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 Dec 7)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 7, compiled " +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 8)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 8, compiled "