vim-patch:7.4.2033

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

6d20e17544

All changes applied manually. Definition of `CSQF_CMDS` was moved to
`option_defs.h` in nvim.

src/nvim/option_defs.h

@@ -380,7 +380,7 @@ EXTERN char_u   *p_cpo;         /* 'cpoptions' */
 EXTERN char_u   *p_csprg;       /* 'cscopeprg' */
 EXTERN int p_csre;              /* 'cscoperelative' */
 EXTERN char_u   *p_csqf;        /* 'cscopequickfix' */
-#  define       CSQF_CMDS   "sgdctefi"
+#  define       CSQF_CMDS   "sgdctefia"
 #  define       CSQF_FLAGS  "+-0"
 EXTERN int p_cst;               /* 'cscopetag' */
 EXTERN long p_csto;             /* 'cscopetagorder' */

src/nvim/testdir/Makefile

@@ -32,6 +32,7 @@ SCRIPTS := \
 # Tests using runtest.vim.vim.
 # Keep test_alot*.res as the last one, sort the others.
 NEW_TESTS = \
+	    test_cscope.res \
 	    test_hardcopy.res \
 	    test_help_tagjump.res \
 	    test_langmap.res \

src/nvim/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

src/nvim/version.c

@@ -243,7 +243,7 @@ static int included_patches[] = {
   // 2036,
   // 2035 NA
   // 2034 NA
-  // 2033,
+  2033,
   // 2032 NA
   // 2031,
   // 2030 NA