To: vim_dev@googlegroups.com Subject: Patch 7.4.2033 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2033 Problem: 'cscopequickfix' option does not accept new value "a". Solution: Adjust list of command characters. (Ken Takata) Files: src/option.h, src/Makefile, src/testdir/test_cscope.vim, src/testdir/Make_all.mak *** ../vim-7.4.2032/src/option.h 2016-04-29 22:58:25.622876633 +0200 --- src/option.h 2016-07-13 22:32:52.879890559 +0200 *************** *** 429,435 **** EXTERN int p_csre; /* 'cscoperelative' */ # ifdef FEAT_QUICKFIX EXTERN char_u *p_csqf; /* 'cscopequickfix' */ ! # define CSQF_CMDS "sgdctefi" # define CSQF_FLAGS "+-0" # endif EXTERN int p_cst; /* 'cscopetag' */ --- 429,435 ---- EXTERN int p_csre; /* 'cscoperelative' */ # ifdef FEAT_QUICKFIX EXTERN char_u *p_csqf; /* 'cscopequickfix' */ ! # define CSQF_CMDS "sgdctefia" # define CSQF_FLAGS "+-0" # endif EXTERN int p_cst; /* 'cscopetag' */ *** ../vim-7.4.2032/src/Makefile 2016-07-09 23:40:29.843039038 +0200 --- src/Makefile 2016-07-13 22:39:18.738200358 +0200 *************** *** 2022,2027 **** --- 2022,2028 ---- test_cdo \ test_channel \ test_cmdline \ + test_cscope \ test_cursor_func \ test_delete \ test_ex_undo \ *** ../vim-7.4.2032/src/testdir/test_cscope.vim 2016-07-13 22:43:07.878822070 +0200 --- src/testdir/test_cscope.vim 2016-07-13 22:42:16.807574978 +0200 *************** *** 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 *** ../vim-7.4.2032/src/testdir/Make_all.mak 2016-07-09 23:40:29.843039038 +0200 --- src/testdir/Make_all.mak 2016-07-13 22:38:39.594777520 +0200 *************** *** 169,174 **** --- 169,175 ---- test_cdo.res \ test_channel.res \ test_cmdline.res \ + test_cscope.res \ test_farsi.res \ test_hardcopy.res \ test_history.res \ *** ../vim-7.4.2032/src/version.c 2016-07-13 20:54:39.502772474 +0200 --- src/version.c 2016-07-13 22:33:34.415277956 +0200 *************** *** 760,761 **** --- 760,763 ---- { /* Add new patch number below this line */ + /**/ + 2033, /**/ -- GALAHAD: No look, really, this isn't nescess ... PIGLET: We must examine you. GALAHAD: There's nothing wrong with ... that. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///