summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-06-12 22:13:40 +0200
committerBram Moolenaar <Bram@vim.org>2011-06-12 22:13:40 +0200
commitf7befa9f1db3db1863aac25e123cd8d5e8c8c35a (patch)
tree1b76af646b87e50c071906774282b08e17ef4eb4
parentd9758e37ee2a2aa75edfca8ddf39780b9b619dec (diff)
updated for version 7.3.215v7.3.215
Problem: Wrong file names in previous patch. (Toothpik) Solution: Include the option changes.
-rw-r--r--src/option.c7
-rw-r--r--src/option.h1
-rw-r--r--src/version.c2
3 files changed, 10 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c
index 718464951c..4db302714a 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 b5f7d47ef3..b7f1bd9f4b 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 235ae8026b..e9c2582238 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,