diff options
| author | KillTheMule <KillTheMule@users.noreply.github.com> | 2016-08-25 21:16:26 +0200 |
|---|---|---|
| committer | KillTheMule <KillTheMule@users.noreply.github.com> | 2016-08-26 21:50:19 +0200 |
| commit | 59468e3495a253e7628f0b12a4afb748909317c6 (patch) | |
| tree | fcc3276d2bf6758172c91c3c2a5f1829a0675fe3 | |
| parent | 1995be8451d130b88ef4f1d012921e328a8c8495 (diff) | |
| download | rneovim-59468e3495a253e7628f0b12a4afb748909317c6.tar.gz rneovim-59468e3495a253e7628f0b12a4afb748909317c6.tar.bz2 rneovim-59468e3495a253e7628f0b12a4afb748909317c6.zip | |
vim-patch:7.4.2033
Problem: 'cscopequickfix' option does not accept new value "a".
Solution: Adjust list of command characters. (Ken Takata)
https://github.com/vim/vim/commit/6d20e1754461b0f8d395f2e3464f0dc1060497f7
All changes applied manually. Definition of `CSQF_CMDS` was moved to
`option_defs.h` in nvim.
| -rw-r--r-- | src/nvim/option_defs.h | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/Makefile | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_cscope.vim | 15 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
4 files changed, 18 insertions, 2 deletions
diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index 8d6f42e088..7e44b0b125 100644 --- a/src/nvim/option_defs.h +++ b/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' */ diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 4979aae57a..57c99e9845 100644 --- a/src/nvim/testdir/Makefile +++ b/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 \ diff --git a/src/nvim/testdir/test_cscope.vim b/src/nvim/testdir/test_cscope.vim new file mode 100644 index 0000000000..b6d70f0765 --- /dev/null +++ b/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 diff --git a/src/nvim/version.c b/src/nvim/version.c index a47e06e9e1..448f5908af 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -243,7 +243,7 @@ static int included_patches[] = { // 2036, // 2035 NA // 2034 NA - // 2033, + 2033, // 2032 NA // 2031, // 2030 NA |