summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-07-13 22:44:12 +0200
committerBram Moolenaar <Bram@vim.org>2016-07-13 22:44:12 +0200
commit6d20e1754461b0f8d395f2e3464f0dc1060497f7 (patch)
treeeaae1bbf236240f6978302fe22b4fd9ca99cff8c
parent3e946fdc7b3639f84c96cd8a5d5b4b4b010f56ea (diff)
downloadvim-git-6d20e1754461b0f8d395f2e3464f0dc1060497f7.tar.gz
patch 7.4.2033v7.4.2033
Problem: 'cscopequickfix' option does not accept new value "a". Solution: Adjust list of command characters. (Ken Takata)
-rw-r--r--src/Makefile1
-rw-r--r--src/option.h2
-rw-r--r--src/testdir/Make_all.mak1
-rw-r--r--src/testdir/test_cscope.vim15
-rw-r--r--src/version.c2
5 files changed, 20 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index 24aa9ca29..f08b58ccc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2022,6 +2022,7 @@ test_arglist \
test_cdo \
test_channel \
test_cmdline \
+ test_cscope \
test_cursor_func \
test_delete \
test_ex_undo \
diff --git a/src/option.h b/src/option.h
index 6fba8b831..8f75993db 100644
--- a/src/option.h
+++ b/src/option.h
@@ -429,7 +429,7 @@ EXTERN char_u *p_csprg; /* 'cscopeprg' */
EXTERN int p_csre; /* 'cscoperelative' */
# ifdef FEAT_QUICKFIX
EXTERN char_u *p_csqf; /* 'cscopequickfix' */
-# define CSQF_CMDS "sgdctefi"
+# define CSQF_CMDS "sgdctefia"
# define CSQF_FLAGS "+-0"
# endif
EXTERN int p_cst; /* 'cscopetag' */
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index dabf57314..8393de819 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -169,6 +169,7 @@ NEW_TESTS = test_arglist.res \
test_cdo.res \
test_channel.res \
test_cmdline.res \
+ test_cscope.res \
test_farsi.res \
test_hardcopy.res \
test_history.res \
diff --git a/src/testdir/test_cscope.vim b/src/testdir/test_cscope.vim
new file mode 100644
index 000000000..b6d70f076
--- /dev/null
+++ b/src/testdir/test_cscope.vim
@@ -0,0 +1,15 @@
+" Test for cscope commands.
+
+if !has('cscope')
+ finish
+endif
+
+func Test_cscopequickfix()
+ set cscopequickfix=s-,g-,d+,c-,t+,e-,f0,i-,a-
+ call assert_equal('s-,g-,d+,c-,t+,e-,f0,i-,a-', &cscopequickfix)
+
+ call assert_fails('set cscopequickfix=x-', 'E474:')
+ call assert_fails('set cscopequickfix=s', 'E474:')
+ call assert_fails('set cscopequickfix=s7', 'E474:')
+ call assert_fails('set cscopequickfix=s-a', 'E474:')
+endfunc
diff --git a/src/version.c b/src/version.c
index 895937eeb..6dbbeb9ce 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2033,
+/**/
2032,
/**/
2031,