From: Stefan Huber Date: Wed, 5 Dec 2012 08:38:45 +0000 (+0100) Subject: vim: colorscheme update, mail scissors X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;h=455842494106c4f7f3906536074ae2d629ed612b;p=shutils.git vim: colorscheme update, mail scissors --- diff --git a/dotfiles/vim/.gvimrc b/dotfiles/vim/.gvimrc index 60c1cdd..3c6d7ab 100644 --- a/dotfiles/vim/.gvimrc +++ b/dotfiles/vim/.gvimrc @@ -1,5 +1,4 @@ - " {{{ vimrc.local if filereadable("/etc/vim/gvimrc") source /etc/vim/gvimrc @@ -14,10 +13,7 @@ set cursorline "set mousehide set nomousehide -colorscheme sienna_shuber -Colo light -"Colo dark - +colorscheme shuber function SetPresentationFont(mode) diff --git a/dotfiles/vim/.vim/colors/shuber.vim b/dotfiles/vim/.vim/colors/shuber.vim new file mode 100644 index 0000000..87fd8c8 --- /dev/null +++ b/dotfiles/vim/.vim/colors/shuber.vim @@ -0,0 +1,73 @@ +" Vim colour scheme +" Maintainer: Stefan Huber +" Last Change: 05 Dez 2012 +" Version: 1.0 +" +" This color scheme is based on sienna by Georg Dahn, version 1.6. + +set background=light +if exists("syntax_on") + syntax reset +endif + +let g:colors_name = 'shuber' + +hi Normal gui=none guifg=Black guibg=White + +hi Cursor guifg=White guibg=Black +hi CursorLine guibg=Grey90 +hi ColorColumn guibg=Grey95 +hi LineNr gui=none guifg=DarkGray +hi NonText gui=bold guifg=DarkGray guibg=Grey95 +hi SpecialKey gui=none guifg=RoyalBlue4 +hi Title gui=bold guifg=Black +hi Visual gui=bold guifg=Black guibg=Sienna1 + +hi FoldColumn gui=none guifg=Black guibg=Wheat2 +hi Folded gui=none guifg=Black guibg=Wheat1 +hi StatusLine gui=bold guifg=White guibg=Black +hi StatusLineNC gui=none guifg=White guibg=DimGray +hi VertSplit gui=none guifg=White guibg=DimGray +hi Wildmenu gui=bold guifg=Black guibg=White + +hi Pmenu guibg=Grey65 guifg=Black gui=none +hi PmenuSbar guibg=Grey50 guifg=fg gui=none +hi PmenuSel guibg=Yellow guifg=Black gui=none +hi PmenuThumb guibg=Grey75 guifg=fg gui=none + +hi IncSearch gui=none guifg=White guibg=DarkGoldenrod +hi Search gui=none guifg=Black guibg=gold + +hi MoreMsg gui=bold guifg=ForestGreen +hi Question gui=bold guifg=ForestGreen +hi WarningMsg gui=bold guifg=Red + +hi Comment gui=italic guifg=SteelBlue3 +hi Error gui=none guifg=White guibg=Red +hi Identifier gui=none guifg=Sienna4 +hi Special gui=none guifg=MediumPurple +hi PreProc gui=none guifg=RoyalBlue3 +hi Todo gui=bold guifg=Black guibg=Yellow +hi Type gui=bold guifg=RoyalBlue4 +hi Underlined gui=underline guifg=Blue + +hi Boolean gui=bold guifg=ForestGreen +hi Constant gui=none guifg=OliveDrab +hi Number gui=bold guifg=ForestGreen +hi String gui=none guifg=ForestGreen + +hi Label gui=bold,underline guifg=Sienna4 +hi Statement gui=bold guifg=Sienna4 + +hi htmlBold gui=bold +hi htmlItalic gui=italic +hi htmlUnderline gui=underline +hi htmlBoldItalic gui=bold,italic +hi htmlBoldUnderline gui=bold,underline +hi htmlBoldUnderlineItalic gui=bold,underline,italic +hi htmlUnderlineItalic gui=underline,italic + +hi mailQuoted1 guifg=SteelBlue3 +hi mailQuoted2 guifg=Sienna4 +hi mailQuoted3 guifg=ForestGreen +hi mailQuoted4 guifg=MediumPurple diff --git a/dotfiles/vim/.vim/colors/sienna_shuber.vim b/dotfiles/vim/.vim/colors/sienna_shuber.vim deleted file mode 100644 index a8ad5c8..0000000 --- a/dotfiles/vim/.vim/colors/sienna_shuber.vim +++ /dev/null @@ -1,156 +0,0 @@ -" Vim colour scheme -" Maintainer: Georg Dahn -" Last Change: 26 April 2006 -" Version: 1.6 -" -" This color scheme has both light and dark styles with harmonic colors -" easy to distinguish. Terminals are not supported, therefore you should -" only try it if you use the GUI version of Vim. -" -" You can choose the style by adding one of the following lines to your -" vimrc or gvimrc file before sourcing the color scheme: -" -" let g:sienna_style = 'dark' -" let g:sienna_style = 'light' -" -" If none of above lines is given, the light style is choosen. -" -" You can switch between these styles by using the :Colo command, like -" :Colo dark or :Colo light (many thanks to Pan Shizhu). - -if exists("g:sienna_style") - let s:sienna_style = g:sienna_style -else - let s:sienna_style = 'light' -endif - -execute "command! -nargs=1 Colo let g:sienna_style = \"\" | colo sienna_shuber" - -if s:sienna_style == 'dark' - set background=dark -elseif s:sienna_style == 'light' - set background=light -else - finish -endif - -if exists("syntax_on") - syntax reset -endif - -let g:colors_name = 'sienna' - -if s:sienna_style == 'dark' - hi Normal gui=none guifg=Grey85 guibg=Grey15 - - hi Cursor guifg=Black guibg=Grey85 - hi CursorLine guibg=Grey25 - hi ColorColumn guibg=Grey25 - hi LineNr gui=none guifg=Grey65 - hi NonText gui=bold guifg=Grey65 guibg=Grey25 - hi SpecialKey gui=none guifg=SkyBlue2 - hi Title gui=bold guifg=Grey85 - hi Visual gui=bold guifg=Black guibg=LightSalmon1 - - hi FoldColumn gui=none guifg=Black guibg=Wheat3 - hi Folded gui=none guifg=White guibg=Wheat4 - hi StatusLine gui=bold guifg=Black guibg=Grey85 - hi StatusLineNC gui=none guifg=White guibg=DimGray - hi VertSplit gui=none guifg=White guibg=DimGray - hi Wildmenu gui=bold guifg=White guibg=Black - - hi Pmenu guibg=Grey55 guifg=Black gui=none - hi PmenuSbar guibg=Grey40 guifg=fg gui=none - hi PmenuSel guibg=Yellow2 guifg=Black gui=none - hi PmenuThumb guibg=Grey80 guifg=bg gui=none - - hi IncSearch gui=none guifg=Grey15 guibg=Grey85 - hi Search gui=none guifg=Black guibg=Yellow2 - - hi MoreMsg gui=bold guifg=PaleGreen2 - hi Question gui=bold guifg=PaleGreen2 - hi WarningMsg gui=bold guifg=Red - - hi Comment gui=italic guifg=SkyBlue4 - hi Error gui=none guifg=White guibg=Red2 - hi Identifier gui=none guifg=LightSalmon2 - hi Special gui=none guifg=SkyBlue2 - hi PreProc gui=none guifg=SkyBlue3 - hi Todo gui=bold guifg=Black guibg=Yellow2 - hi Type gui=bold guifg=SkyBlue2 - hi Underlined gui=underline guifg=DodgerBlue - - hi Boolean gui=bold guifg=PaleGreen2 - hi Constant gui=none guifg=PaleGreen2 - hi Number gui=bold guifg=PaleGreen2 - hi String gui=none guifg=PaleGreen2 - - hi Label gui=bold,underline guifg=LightSalmon2 - hi Statement gui=bold guifg=LightSalmon2 - - hi htmlBold gui=bold - hi htmlItalic gui=italic - hi htmlUnderline gui=underline - hi htmlBoldItalic gui=bold,italic - hi htmlBoldUnderline gui=bold,underline - hi htmlBoldUnderlineItalic gui=bold,underline,italic - hi htmlUnderlineItalic gui=underline,italic -elseif s:sienna_style == 'light' - hi Normal gui=none guifg=Black guibg=White - - hi Cursor guifg=White guibg=Black - hi CursorLine guibg=Grey90 - hi ColorColumn guibg=Grey95 - hi LineNr gui=none guifg=DarkGray - hi NonText gui=bold guifg=DarkGray guibg=Grey95 - hi SpecialKey gui=none guifg=RoyalBlue4 - hi Title gui=bold guifg=Black - hi Visual gui=bold guifg=Black guibg=Sienna1 - - hi FoldColumn gui=none guifg=Black guibg=Wheat2 - hi Folded gui=none guifg=Black guibg=Wheat1 - hi StatusLine gui=bold guifg=White guibg=Black - hi StatusLineNC gui=none guifg=White guibg=DimGray - hi VertSplit gui=none guifg=White guibg=DimGray - hi Wildmenu gui=bold guifg=Black guibg=White - - hi Pmenu guibg=Grey65 guifg=Black gui=none - hi PmenuSbar guibg=Grey50 guifg=fg gui=none - hi PmenuSel guibg=Yellow guifg=Black gui=none - hi PmenuThumb guibg=Grey75 guifg=fg gui=none - - hi IncSearch gui=none guifg=White guibg=DarkGoldenrod - hi Search gui=none guifg=Black guibg=gold - - hi MoreMsg gui=bold guifg=ForestGreen - hi Question gui=bold guifg=ForestGreen - hi WarningMsg gui=bold guifg=Red - -" hi Comment gui=italic guifg=Grey44 - hi Comment gui=italic guifg=SteelBlue3 - hi Error gui=none guifg=White guibg=Red - hi Identifier gui=none guifg=Sienna4 - hi Special gui=none guifg=RoyalBlue4 - hi PreProc gui=none guifg=RoyalBlue3 - hi Todo gui=bold guifg=Black guibg=Yellow - hi Type gui=bold guifg=RoyalBlue4 - hi Underlined gui=underline guifg=Blue - - hi Boolean gui=bold guifg=ForestGreen - hi Constant gui=none guifg=ForestGreen - hi Number gui=bold guifg=ForestGreen - hi String gui=none guifg=ForestGreen - - hi Label gui=bold,underline guifg=Sienna4 - hi Statement gui=bold guifg=Sienna4 - - hi htmlBold gui=bold - hi htmlItalic gui=italic - hi htmlUnderline gui=underline - hi htmlBoldItalic gui=bold,italic - hi htmlBoldUnderline gui=bold,underline - hi htmlBoldUnderlineItalic gui=bold,underline,italic - hi htmlUnderlineItalic gui=underline,italic -endif - - diff --git a/dotfiles/vim/.vimrc b/dotfiles/vim/.vimrc index 10dd903..1e40b8b 100644 --- a/dotfiles/vim/.vimrc +++ b/dotfiles/vim/.vimrc @@ -169,6 +169,10 @@ if version>=700 au Filetype mail,text set fo+=n spell endif +"Scissor line +au Filetype mail syn match Statement /^\s*-*\s*>8\s*-*\s*$/ +au Filetype mail syn match Statement /^\s*-*\s*8<\s*-*\s*$/ + """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""