diff options
author | Bram Moolenaar <bram@vim.org> | 2011-06-12 22:13:40 +0200 |
---|---|---|
committer | Bram Moolenaar <bram@vim.org> | 2011-06-12 22:13:40 +0200 |
commit | 2c24bb44eb5178c19f7cdf4b71e86a5e3c67a05d (patch) | |
tree | 0f0468ab20948967866e96fc444f6bd8c2448e5e | |
parent | 2574973999bd7e16dd187224b530e223e2d73171 (diff) | |
download | vim-2c24bb44eb5178c19f7cdf4b71e86a5e3c67a05d.tar.gz |
Problem: Wrong file names in previous patch. (Toothpik)
Solution: Include the option changes.
-rw-r--r-- | src/option.c | 7 | ||||
-rw-r--r-- | src/option.h | 1 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c index 71846495..4db30271 100644 --- a/src/option.c +++ b/src/option.c @@ -901,6 +901,13 @@ static struct vimoption {(char_u *)0L, (char_u *)0L} #endif SCRIPTID_INIT}, + {"cscoperelative", "csre", P_BOOL|P_VI_DEF|P_VIM, +#ifdef FEAT_CSCOPE + (char_u *)&p_csre, PV_NONE, +#else + (char_u *)NULL, PV_NONE, +#endif + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, {"cscopetag", "cst", P_BOOL|P_VI_DEF|P_VIM, #ifdef FEAT_CSCOPE (char_u *)&p_cst, PV_NONE, diff --git a/src/option.h b/src/option.h index b5f7d47e..b7f1bd9f 100644 --- a/src/option.h +++ b/src/option.h @@ -391,6 +391,7 @@ EXTERN long p_ph; /* 'pumheight' */ EXTERN char_u *p_cpo; /* 'cpoptions' */ #ifdef FEAT_CSCOPE EXTERN char_u *p_csprg; /* 'cscopeprg' */ +EXTERN int p_csre; /* 'cscoperelative' */ # ifdef FEAT_QUICKFIX EXTERN char_u *p_csqf; /* 'cscopequickfix' */ # define CSQF_CMDS "sgdctefi" diff --git a/src/version.c b/src/version.c index 235ae802..e9c25822 100644 --- a/src/version.c +++ b/src/version.c @@ -710,6 +710,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 215, +/**/ 214, /**/ 213, |