From e0b3d765a6b5407ee5b4ba22642a0586f1bd52b4 Mon Sep 17 00:00:00 2001 From: stack Date: Wed, 20 Feb 2013 17:10:32 +0100 Subject: [PATCH 1/1] Cscope and plugin updated --- addons/SuperTab%1643 | 2 +- addons/Tagbar | 2 +- addons/The_NERD_tree | 2 +- addons/checksyntax | 2 +- addons/desert/README | 13 +++ addons/desert/addon-info.json | 1 + addons/desert/colors/desert.vim | 110 ++++++++++++++++++++ addons/desert/desert.vim | 110 ++++++++++++++++++++ addons/quickfixsigns | 2 +- addons/snipmate | 2 +- addons/snipmate-snippets | 2 +- addons/surround | 2 +- addons/tlib | 2 +- addons/vim-addon-manager-known-repositories | 2 +- addons/vim-addon-mw-utils | 2 +- vimrc | 22 +++- 16 files changed, 265 insertions(+), 13 deletions(-) create mode 100644 addons/desert/README create mode 100644 addons/desert/addon-info.json create mode 100644 addons/desert/colors/desert.vim create mode 100644 addons/desert/desert.vim diff --git a/addons/SuperTab%1643 b/addons/SuperTab%1643 index e299037..a2268b6 160000 --- a/addons/SuperTab%1643 +++ b/addons/SuperTab%1643 @@ -1 +1 @@ -Subproject commit e2990372442fdf026cc1ef458abdf9a1a4e891ef +Subproject commit a2268b61edc4ba38d152ecfa7c853a7f1bc71370 diff --git a/addons/Tagbar b/addons/Tagbar index 568ef5f..852c6da 160000 --- a/addons/Tagbar +++ b/addons/Tagbar @@ -1 +1 @@ -Subproject commit 568ef5fd25468a58723b50cf40a48c5dcb46c802 +Subproject commit 852c6dac690b315a611875698122564bda852b63 diff --git a/addons/The_NERD_tree b/addons/The_NERD_tree index d62180d..40d05ac 160000 --- a/addons/The_NERD_tree +++ b/addons/The_NERD_tree @@ -1 +1 @@ -Subproject commit d62180d0ff26d308b815205ca2f2cd651a112b49 +Subproject commit 40d05ace57fb51cc2c2b2e9eb81c4832ed291630 diff --git a/addons/checksyntax b/addons/checksyntax index 8dc46cd..26ff38d 160000 --- a/addons/checksyntax +++ b/addons/checksyntax @@ -1 +1 @@ -Subproject commit 8dc46cd61b74af77ba9ad05fa1f61ea16842c7e8 +Subproject commit 26ff38d469fb4e3c304002c6cf9bad3abd57fdac diff --git a/addons/desert/README b/addons/desert/README new file mode 100644 index 0000000..6e48351 --- /dev/null +++ b/addons/desert/README @@ -0,0 +1,13 @@ +I started with the evening colorscheme included in the distro, and tweaked a +few colors to my liking. Then I decided to do a major overhaul and give the +whole thing a desert evening sort of feel. I find it a very pleasing, +easy-on-the-eyes theme. + +Screenshot: http://hans.fugal.net/vim/colors/desert.html + +Get the latest version at https://github.com/fugalh/desert.vim +Put in ~/.vim/colors or (\vimfiles\colors on Windows) and do +:colorscheme desert + +I mostly don't maintain this anymore. Occasionally someone has a tweak +suggestion - I recommend forking this and sending a pull request, or not. diff --git a/addons/desert/addon-info.json b/addons/desert/addon-info.json new file mode 100644 index 0000000..68c0a81 --- /dev/null +++ b/addons/desert/addon-info.json @@ -0,0 +1 @@ +{'post-scms-update-hook': 'call vam#utils#CopyFile(%d.''/desert.vim'', %d.''/colors/desert.vim'')', 'post-install-hook': 'call mkdir(%d.''/colors'') | call vam#utils#CopyFile(%d.''/desert.vim'', %d.''/colors/desert.vim'')'} diff --git a/addons/desert/colors/desert.vim b/addons/desert/colors/desert.vim new file mode 100644 index 0000000..65d45a5 --- /dev/null +++ b/addons/desert/colors/desert.vim @@ -0,0 +1,110 @@ +" Vim color file +" Maintainer: Hans Fugal +" Last Change: $Date: 2003/07/24 00:57:11 $ +" Last Change: $Date: 2003/07/24 00:57:11 $ +" URL: http://hans.fugal.net/vim/colors/desert.vim +" Version: $Id: desert.vim,v 1.7 2003/07/24 00:57:11 fugalh Exp $ + +" cool help screens +" :he group-name +" :he highlight-groups +" :he cterm-colors + +set background=dark +if version > 580 + " no guarantees for version 5.8 and below, but this makes it stop + " complaining + hi clear + if exists("syntax_on") + syntax reset + endif +endif +let g:colors_name="desert" + +hi Normal guifg=White guibg=grey20 + +" highlight groups +hi Cursor guibg=indianred guifg=khaki +"hi CursorIM +"hi Directory +"hi DiffAdd +"hi DiffChange +"hi DiffDelete +"hi DiffText +"hi ErrorMsg +hi VertSplit guibg=#c2bfa5 guifg=grey50 gui=none +hi Folded guibg=grey30 guifg=gold +hi FoldColumn guibg=grey30 guifg=tan +hi IncSearch guifg=slategrey guibg=khaki +"hi LineNr +hi ModeMsg guifg=goldenrod +hi MoreMsg guifg=SeaGreen +hi NonText guifg=LightBlue guibg=grey30 +hi Question guifg=springgreen +hi Search guibg=grey30 guifg=#dfffdf +hi SpecialKey guifg=yellowgreen +hi StatusLine guibg=#c2bfa5 guifg=black gui=none +hi StatusLineNC guibg=#c2bfa5 guifg=grey50 gui=none +hi Title guifg=indianred +hi Visual gui=none guifg=khaki guibg=olivedrab +"hi VisualNOS +hi WarningMsg guifg=salmon +"hi WildMenu +"hi Menu +"hi Scrollbar +"hi Tooltip +hi MatchParen guibg=grey30 guifg=#dfffdf + +" syntax highlighting groups +hi Comment guifg=SkyBlue +hi Constant guifg=#ffa0a0 +hi Identifier guifg=palegreen +hi Statement guifg=khaki +hi PreProc guifg=indianred +hi Type guifg=darkkhaki +hi Special guifg=navajowhite +"hi Underlined +hi Ignore guifg=grey40 +"hi Error +hi Todo guifg=orangered guibg=yellow2 + +" color terminal definitions +hi SpecialKey ctermfg=darkgreen +hi NonText cterm=bold ctermfg=darkblue +hi Directory ctermfg=darkcyan +hi ErrorMsg cterm=bold ctermfg=7 ctermbg=1 +hi IncSearch cterm=NONE ctermfg=yellow ctermbg=green +hi Search cterm=NONE ctermfg=grey ctermbg=blue +hi MoreMsg ctermfg=darkgreen +hi ModeMsg cterm=NONE ctermfg=brown +hi LineNr ctermfg=3 +hi Question ctermfg=green +hi StatusLine cterm=bold,reverse +hi StatusLineNC cterm=reverse +hi VertSplit cterm=reverse +hi Title ctermfg=5 +hi Visual cterm=reverse +hi VisualNOS cterm=bold,underline +hi WarningMsg ctermfg=1 +hi WildMenu ctermfg=0 ctermbg=3 +hi Folded ctermfg=darkgrey ctermbg=NONE +hi FoldColumn ctermfg=darkgrey ctermbg=NONE +hi DiffAdd ctermbg=4 +hi DiffChange ctermbg=5 +hi DiffDelete cterm=bold ctermfg=4 ctermbg=6 +hi DiffText cterm=bold ctermbg=1 +hi Comment ctermfg=darkcyan +hi Constant ctermfg=brown +hi Special ctermfg=5 +hi Identifier ctermfg=6 +hi Statement ctermfg=3 +hi PreProc ctermfg=5 +hi Todo ctermfg=red ctermbg=NONE +hi Type ctermfg=2 +hi Underlined cterm=underline ctermfg=5 +hi Ignore cterm=bold ctermfg=7 +hi Ignore ctermfg=darkgrey +hi Error cterm=bold ctermfg=7 ctermbg=1 + + +"vim: sw=4 diff --git a/addons/desert/desert.vim b/addons/desert/desert.vim new file mode 100644 index 0000000..65d45a5 --- /dev/null +++ b/addons/desert/desert.vim @@ -0,0 +1,110 @@ +" Vim color file +" Maintainer: Hans Fugal +" Last Change: $Date: 2003/07/24 00:57:11 $ +" Last Change: $Date: 2003/07/24 00:57:11 $ +" URL: http://hans.fugal.net/vim/colors/desert.vim +" Version: $Id: desert.vim,v 1.7 2003/07/24 00:57:11 fugalh Exp $ + +" cool help screens +" :he group-name +" :he highlight-groups +" :he cterm-colors + +set background=dark +if version > 580 + " no guarantees for version 5.8 and below, but this makes it stop + " complaining + hi clear + if exists("syntax_on") + syntax reset + endif +endif +let g:colors_name="desert" + +hi Normal guifg=White guibg=grey20 + +" highlight groups +hi Cursor guibg=indianred guifg=khaki +"hi CursorIM +"hi Directory +"hi DiffAdd +"hi DiffChange +"hi DiffDelete +"hi DiffText +"hi ErrorMsg +hi VertSplit guibg=#c2bfa5 guifg=grey50 gui=none +hi Folded guibg=grey30 guifg=gold +hi FoldColumn guibg=grey30 guifg=tan +hi IncSearch guifg=slategrey guibg=khaki +"hi LineNr +hi ModeMsg guifg=goldenrod +hi MoreMsg guifg=SeaGreen +hi NonText guifg=LightBlue guibg=grey30 +hi Question guifg=springgreen +hi Search guibg=grey30 guifg=#dfffdf +hi SpecialKey guifg=yellowgreen +hi StatusLine guibg=#c2bfa5 guifg=black gui=none +hi StatusLineNC guibg=#c2bfa5 guifg=grey50 gui=none +hi Title guifg=indianred +hi Visual gui=none guifg=khaki guibg=olivedrab +"hi VisualNOS +hi WarningMsg guifg=salmon +"hi WildMenu +"hi Menu +"hi Scrollbar +"hi Tooltip +hi MatchParen guibg=grey30 guifg=#dfffdf + +" syntax highlighting groups +hi Comment guifg=SkyBlue +hi Constant guifg=#ffa0a0 +hi Identifier guifg=palegreen +hi Statement guifg=khaki +hi PreProc guifg=indianred +hi Type guifg=darkkhaki +hi Special guifg=navajowhite +"hi Underlined +hi Ignore guifg=grey40 +"hi Error +hi Todo guifg=orangered guibg=yellow2 + +" color terminal definitions +hi SpecialKey ctermfg=darkgreen +hi NonText cterm=bold ctermfg=darkblue +hi Directory ctermfg=darkcyan +hi ErrorMsg cterm=bold ctermfg=7 ctermbg=1 +hi IncSearch cterm=NONE ctermfg=yellow ctermbg=green +hi Search cterm=NONE ctermfg=grey ctermbg=blue +hi MoreMsg ctermfg=darkgreen +hi ModeMsg cterm=NONE ctermfg=brown +hi LineNr ctermfg=3 +hi Question ctermfg=green +hi StatusLine cterm=bold,reverse +hi StatusLineNC cterm=reverse +hi VertSplit cterm=reverse +hi Title ctermfg=5 +hi Visual cterm=reverse +hi VisualNOS cterm=bold,underline +hi WarningMsg ctermfg=1 +hi WildMenu ctermfg=0 ctermbg=3 +hi Folded ctermfg=darkgrey ctermbg=NONE +hi FoldColumn ctermfg=darkgrey ctermbg=NONE +hi DiffAdd ctermbg=4 +hi DiffChange ctermbg=5 +hi DiffDelete cterm=bold ctermfg=4 ctermbg=6 +hi DiffText cterm=bold ctermbg=1 +hi Comment ctermfg=darkcyan +hi Constant ctermfg=brown +hi Special ctermfg=5 +hi Identifier ctermfg=6 +hi Statement ctermfg=3 +hi PreProc ctermfg=5 +hi Todo ctermfg=red ctermbg=NONE +hi Type ctermfg=2 +hi Underlined cterm=underline ctermfg=5 +hi Ignore cterm=bold ctermfg=7 +hi Ignore ctermfg=darkgrey +hi Error cterm=bold ctermfg=7 ctermbg=1 + + +"vim: sw=4 diff --git a/addons/quickfixsigns b/addons/quickfixsigns index aad9de9..36e0c98 160000 --- a/addons/quickfixsigns +++ b/addons/quickfixsigns @@ -1 +1 @@ -Subproject commit aad9de994303189365fa8e3f14dcf4250cfb210a +Subproject commit 36e0c98f5f39e466c833d85e910f87430c5cb9c4 diff --git a/addons/snipmate b/addons/snipmate index 4c6655a..2bd4968 160000 --- a/addons/snipmate +++ b/addons/snipmate @@ -1 +1 @@ -Subproject commit 4c6655a22f56269a236eead281cdd510aeff19d3 +Subproject commit 2bd4968f2dc720319ccd4184e9c9136a75141591 diff --git a/addons/snipmate-snippets b/addons/snipmate-snippets index 5aa6283..d1b3fc3 160000 --- a/addons/snipmate-snippets +++ b/addons/snipmate-snippets @@ -1 +1 @@ -Subproject commit 5aa62837a8686ed74ea8119b7a67a8e0ca6e5689 +Subproject commit d1b3fc39fdf4c4e0c2cd22657b8674e45e8f46d5 diff --git a/addons/surround b/addons/surround index 1a73f60..02199ea 160000 --- a/addons/surround +++ b/addons/surround @@ -1 +1 @@ -Subproject commit 1a73f607f8f5477d6942df2eb6e7245c4864f4d3 +Subproject commit 02199ea0080d744ec76b79d74ce56d51d25cf7ae diff --git a/addons/tlib b/addons/tlib index 992c218..58122ab 160000 --- a/addons/tlib +++ b/addons/tlib @@ -1 +1 @@ -Subproject commit 992c21804d003faffcaec0014a5f61e2ce76f57e +Subproject commit 58122ab00417416757d62867f785d5a96021c0d0 diff --git a/addons/vim-addon-manager-known-repositories b/addons/vim-addon-manager-known-repositories index d9fcfbf..1002263 160000 --- a/addons/vim-addon-manager-known-repositories +++ b/addons/vim-addon-manager-known-repositories @@ -1 +1 @@ -Subproject commit d9fcfbf70e04c64d8dd277a0a845ad4d341b00e0 +Subproject commit 1002263b7ffe8b53ce3ef45c17e1ba50285cd586 diff --git a/addons/vim-addon-mw-utils b/addons/vim-addon-mw-utils index a1b611a..0c5612f 160000 --- a/addons/vim-addon-mw-utils +++ b/addons/vim-addon-mw-utils @@ -1 +1 @@ -Subproject commit a1b611ab22745f8b877d8de4f09985a0ddf3acfd +Subproject commit 0c5612fa31ee434ba055e21c76f456244b3b5109 diff --git a/vimrc b/vimrc index 28d68f4..2b6b92a 100644 --- a/vimrc +++ b/vimrc @@ -187,6 +187,7 @@ if has ("autocmd") autocmd FileType c,cpp,slang set cindent autocmd FileType c,cpp,slang set textwidth=79 + autocmd FileType c,cpp,slang set tags=./tags,/usr/src/linux/tags,~/.vim/tags/usr/include/tags autocmd BufEnter * :syntax sync fromstart " ensure every file does syntax highlighting (full) autocmd BufNewFile *.sh call append(0, "#!/bin/bash") @@ -232,11 +233,11 @@ let vam_install_path = expand('$HOME') . '/.vim/addons' exec 'set runtimepath+='.vam_install_path.'/vim-addon-manager' " Enable addons with vim-addon-manager using file type recognition let ft_addons = { - \ 'always': ['desert', 'surround', 'checksyntax', 'quickfixsigns', 'LargeFile', 'snipmate', 'snipmate-snippets', 'The_NERD_tree', 'SuperTab%1643'], + \ 'always': ['desert', 'gnupg', 'surround', 'checksyntax', 'quickfixsigns', 'LargeFile', 'snipmate', 'snipmate-snippets', 'The_NERD_tree', 'SuperTab%1643', 'fugitive'], \ 'r': [ 'Screen_vim__gnu_screentmux', 'Vim-R-plugin' ], \ '^\%(c\|cpp\|javascript\|python\|php\|html\|xml\|r\|sh\|css\|java\|make\|xslt\|vim\)$': [ 'Tagbar', 'checksyntax', 'TagHighlight'], \ '^\%(c\|cpp\|h\)$': [ 'clang_complete' ], - \ 'python': ['pythoncomplete', 'python_pydoc'], + \ 'python': [ 'python_pydoc'], \ 'php': ['phpcomplete', 'PDV_-_phpDocumentor_for_Vim'], \ 'gpg': ['gnupg'], \ } @@ -256,3 +257,20 @@ endif let g:clang_complete_copen = 1 let g:clang_complete_auto = 1 let g:clang_user_options='|| exit 0' + +if has("cscope") + set csto=0 + set cst + set nocsverb + " add any database in current directory + if filereadable("cscope.out") + cs add cscope.out + " else add database pointed to by environment + elseif $CSCOPE_DB != "" + cs add $CSCOPE_DB + endif + if filereadable("/usr/linux/cscope.out") + cs add /usr/linux/cscope.out + endif + set csverb +endif -- 2.20.1