patch 7.4.2033

Problem:    'cscopequickfix' option does not accept new value "a".
Solution:   Adjust list of command characters. (Ken Takata)

diff --git a/src/Makefile b/src/Makefile
index 24aa9ca293e990a13658763e3f16b35d2c3657e2..f08b58cccb53125206c9e3ee912e66442e030b52 100644 (file)
--- 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 6fba8b83184d6600078db38ae5cf59783a6c61c8..8f75993db8d03377c98339ad43959aff47054f4e 100644 (file)
--- 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 dabf5731402e8a2b54499f0f4ee713af436ccbb4..8393de819cc141525a56c9630dd7e1b1a6353169 100644 (file)
--- 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 (file)
index 0000000..b6d70f0
--- /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 895937eeb479957fdfc4bfd317b2a6adadfaf727..6dbbeb9ce0c6e901152f1ad040a6c46c73d06b35 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2033,
 /**/
     2032,
 /**/