gryf/.vim
1
0
Fork 0
mirror of https://github.com/gryf/.vim.git synced 2025-12-17 11:30:29 +01:00
Code Issues Projects Releases Wiki Activity

Update of plugins DirDiff, gundo and buffergator, update colorscheme lucius.

Browse Source
This commit is contained in:
gryf
2011-08-01 22:17:43 +02:00
parent ad9a205b79
commit 2e4921876d
7 changed files with 621 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
GetLatest/GetLatestVimScripts.dat
View File

@@ -1,11 +1,11 @@
ScriptID SourceID Filename ScriptID SourceID Filename
-------------------------- --------------------------
### plugins ### plugins
3619 16002 buffergator 3619 16041 buffergator
102 13435 DirDiff.vim 102 16171 DirDiff.vim
1984 13961 :AutoInstall: FuzzyFinder 1984 13961 :AutoInstall: FuzzyFinder
311 7645 grep.vim 311 7645 grep.vim
3304 15996 gundo.vim 3304 16172 gundo.vim
2727 11120 jsbeautify.vim 2727 11120 jsbeautify.vim
3252 13948 :AutoInstall: L9 3252 13948 :AutoInstall: L9
2289 8922 loremipsum 2289 8922 loremipsum
@@ -25,7 +25,7 @@ ScriptID SourceID Filename
2855 12456 github.vim 2855 12456 github.vim
1143 11833 inkpot.vim 1143 11833 inkpot.vim
2555 15432 jellybeans.vim 2555 15432 jellybeans.vim
2536 15197 lucius.vim 2536 16179 lucius.vim
3299 14475 sorcerer.vim 3299 14475 sorcerer.vim
1165 3741 tolerable.vim 1165 3741 tolerable.vim
3309 15759 vydark 3309 15759 vydark

407
autoload/gundo.vim Normal file
View File

@@ -0,0 +1,407 @@
" ============================================================================
" File: gundo.vim
" Description: vim global plugin to visualize your undo tree
" Maintainer: Steve Losh <steve@stevelosh.com>
" License: GPLv2+ -- look it up.
" Notes: Much of this code was thiefed from Mercurial, and the rest was
" heavily inspired by scratch.vim and histwin.vim.
"
" ============================================================================
"{{{ Init
if v:version < '703'"{{{
function! s:GundoDidNotLoad()
echohl WarningMsg|echomsg "Gundo unavailable: requires Vim 7.3+"|echohl None
endfunction
command! -nargs=0 GundoToggle call s:GundoDidNotLoad()
finish
endif"}}}
if has('python')"{{{
let s:has_supported_python = 1
else
let s:has_supported_python = 0
endif
if !s:has_supported_python
function! s:GundoDidNotLoad()
echohl WarningMsg|echomsg "Gundo requires Vim to be compiled with Python 2.4+"|echohl None
endfunction
command! -nargs=0 GundoToggle call s:GundoDidNotLoad()
finish
endif"}}}
let s:plugin_path = escape(expand('<sfile>:p:h'), '\')
if !exists('g:gundo_width')"{{{
let g:gundo_width = 45
endif"}}}
if !exists('g:gundo_preview_height')"{{{
let g:gundo_preview_height = 15
endif"}}}
if !exists('g:gundo_preview_bottom')"{{{
let g:gundo_preview_bottom = 0
endif"}}}
if !exists('g:gundo_right')"{{{
let g:gundo_right = 0
endif"}}}
if !exists('g:gundo_help')"{{{
let g:gundo_help = 1
endif"}}}
if !exists("g:gundo_map_move_older")"{{{
let g:gundo_map_move_older = 'j'
endif"}}}
if !exists("g:gundo_map_move_newer")"{{{
let g:gundo_map_move_newer = 'k'
endif"}}}
if !exists("g:gundo_close_on_revert")"{{{
let g:gundo_close_on_revert = 0
endif"}}}
"}}}
"{{{ Gundo utility functions
function! s:GundoGetTargetState()"{{{
let target_line = matchstr(getline("."), '\v\[[0-9]+\]')
return matchstr(target_line, '\v[0-9]+')
endfunction"}}}
function! s:GundoGoToWindowForBufferName(name)"{{{
if bufwinnr(bufnr(a:name)) != -1
exe bufwinnr(bufnr(a:name)) . "wincmd w"
return 1
else
return 0
endif
endfunction"}}}
function! s:GundoIsVisible()"{{{
if bufwinnr(bufnr("__Gundo__")) != -1 || bufwinnr(bufnr("__Gundo_Preview__")) != -1
return 1
else
return 0
endif
endfunction"}}}
function! s:GundoInlineHelpLength()"{{{
if g:gundo_help
return 6
else
return 0
endif
endfunction"}}}
"}}}
"{{{ Gundo buffer settings
function! s:GundoMapGraph()"{{{
exec 'nnoremap <script> <silent> <buffer> ' . g:gundo_map_move_older . " :call <sid>GundoMove(1)<CR>"
exec 'nnoremap <script> <silent> <buffer> ' . g:gundo_map_move_newer . " :call <sid>GundoMove(-1)<CR>"
nnoremap <script> <silent> <buffer> <CR> :call <sid>GundoRevert()<CR>
nnoremap <script> <silent> <buffer> o :call <sid>GundoRevert()<CR>
nnoremap <script> <silent> <buffer> <down> :call <sid>GundoMove(1)<CR>
nnoremap <script> <silent> <buffer> <up> :call <sid>GundoMove(-1)<CR>
nnoremap <script> <silent> <buffer> gg gg:call <sid>GundoMove(1)<CR>
nnoremap <script> <silent> <buffer> P :call <sid>GundoPlayTo()<CR>
nnoremap <script> <silent> <buffer> p :call <sid>GundoRenderChangePreview()<CR>
nnoremap <script> <silent> <buffer> q :call <sid>GundoClose()<CR>
cabbrev <script> <silent> <buffer> q call <sid>GundoClose()
cabbrev <script> <silent> <buffer> quit call <sid>GundoClose()
nnoremap <script> <silent> <buffer> <2-LeftMouse> :call <sid>GundoMouseDoubleClick()<CR>
endfunction"}}}
function! s:GundoMapPreview()"{{{
nnoremap <script> <silent> <buffer> q :call <sid>GundoClose()<CR>
cabbrev <script> <silent> <buffer> q call <sid>GundoClose()
cabbrev <script> <silent> <buffer> quit call <sid>GundoClose()
endfunction"}}}
function! s:GundoSettingsGraph()"{{{
setlocal buftype=nofile
setlocal bufhidden=hide
setlocal noswapfile
setlocal nobuflisted
setlocal nomodifiable
setlocal filetype=gundo
setlocal nolist
setlocal nonumber
setlocal norelativenumber
setlocal nowrap
call s:GundoSyntaxGraph()
call s:GundoMapGraph()
endfunction"}}}
function! s:GundoSettingsPreview()"{{{
setlocal buftype=nofile
setlocal bufhidden=hide
setlocal noswapfile
setlocal nobuflisted
setlocal nomodifiable
setlocal filetype=diff
setlocal nonumber
setlocal norelativenumber
setlocal nowrap
setlocal foldlevel=20
setlocal foldmethod=diff
call s:GundoMapPreview()
endfunction"}}}
function! s:GundoSyntaxGraph()"{{{
let b:current_syntax = 'gundo'
syn match GundoCurrentLocation '@'
syn match GundoHelp '\v^".*$'
syn match GundoNumberField '\v\[[0-9]+\]'
syn match GundoNumber '\v[0-9]+' contained containedin=GundoNumberField
hi def link GundoCurrentLocation Keyword
hi def link GundoHelp Comment
hi def link GundoNumberField Comment
hi def link GundoNumber Identifier
endfunction"}}}
"}}}
"{{{ Gundo buffer/window management
function! s:GundoResizeBuffers(backto)"{{{
call s:GundoGoToWindowForBufferName('__Gundo__')
exe "vertical resize " . g:gundo_width
call s:GundoGoToWindowForBufferName('__Gundo_Preview__')
exe "resize " . g:gundo_preview_height
exe a:backto . "wincmd w"
endfunction"}}}
function! s:GundoOpenGraph()"{{{
let existing_gundo_buffer = bufnr("__Gundo__")
if existing_gundo_buffer == -1
call s:GundoGoToWindowForBufferName('__Gundo_Preview__')
exe "new __Gundo__"
if g:gundo_preview_bottom
if g:gundo_right
wincmd L
else
wincmd H
endif
endif
call s:GundoResizeBuffers(winnr())
else
let existing_gundo_window = bufwinnr(existing_gundo_buffer)
if existing_gundo_window != -1
if winnr() != existing_gundo_window
exe existing_gundo_window . "wincmd w"
endif
else
call s:GundoGoToWindowForBufferName('__Gundo_Preview__')
if g:gundo_preview_bottom
if g:gundo_right
exe "botright vsplit +buffer" . existing_gundo_buffer
else
exe "topleft vsplit +buffer" . existing_gundo_buffer
endif
else
exe "split +buffer" . existing_gundo_buffer
endif
call s:GundoResizeBuffers(winnr())
endif
endif
endfunction"}}}
function! s:GundoOpenPreview()"{{{
let existing_preview_buffer = bufnr("__Gundo_Preview__")
if existing_preview_buffer == -1
if g:gundo_preview_bottom
exe "botright new __Gundo_Preview__"
else
if g:gundo_right
exe "botright vnew __Gundo_Preview__"
else
exe "topleft vnew __Gundo_Preview__"
endif
endif
else
let existing_preview_window = bufwinnr(existing_preview_buffer)
if existing_preview_window != -1
if winnr() != existing_preview_window
exe existing_preview_window . "wincmd w"
endif
else
if g:gundo_preview_bottom
exe "botright split +buffer" . existing_preview_buffer
else
if g:gundo_right
exe "botright vsplit +buffer" . existing_preview_buffer
else
exe "topleft vsplit +buffer" . existing_preview_buffer
endif
endif
endif
endif
endfunction"}}}
function! s:GundoClose()"{{{
if s:GundoGoToWindowForBufferName('__Gundo__')
quit
endif
if s:GundoGoToWindowForBufferName('__Gundo_Preview__')
quit
endif
exe bufwinnr(g:gundo_target_n) . "wincmd w"
endfunction"}}}
function! s:GundoOpen()"{{{
if !exists('g:gundo_py_loaded')
exe 'pyfile ' . s:plugin_path . '/gundo.py'
python initPythonModule()
if !s:has_supported_python
function! s:GundoDidNotLoad()
echohl WarningMsg|echomsg "Gundo unavailable: requires Vim 7.3+"|echohl None
endfunction
command! -nargs=0 GundoToggle call s:GundoDidNotLoad()
call s:GundoDidNotLoad()
return
endif"
let g:gundo_py_loaded = 1
endif
" Save `splitbelow` value and set it to default to avoid problems with
" positioning new windows.
let saved_splitbelow = &splitbelow
let &splitbelow = 0
call s:GundoOpenPreview()
exe bufwinnr(g:gundo_target_n) . "wincmd w"
call s:GundoRenderGraph()
call s:GundoRenderPreview()
" Restore `splitbelow` value.
let &splitbelow = saved_splitbelow
endfunction"}}}
function! s:GundoToggle()"{{{
if s:GundoIsVisible()
call s:GundoClose()
else
let g:gundo_target_n = bufnr('')
let g:gundo_target_f = @%
call s:GundoOpen()
endif
endfunction"}}}
"}}}
"{{{ Gundo mouse handling
function! s:GundoMouseDoubleClick()"{{{
let start_line = getline('.')
if stridx(start_line, '[') == -1
return
else
call s:GundoRevert()
endif
endfunction"}}}
"}}}
"{{{ Gundo movement
function! s:GundoMove(direction) range"{{{
let start_line = getline('.')
if v:count1 == 0
let move_count = 1
else
let move_count = v:count1
endif
let distance = 2 * move_count
" If we're in between two nodes we move by one less to get back on track.
if stridx(start_line, '[') == -1
let distance = distance - 1
endif
let target_n = line('.') + (distance * a:direction)
" Bound the movement to the graph.
if target_n <= s:GundoInlineHelpLength() - 1
call cursor(s:GundoInlineHelpLength(), 0)
else
call cursor(target_n, 0)
endif
let line = getline('.')
" Move to the node, whether it's an @ or an o
let idx1 = stridx(line, '@')
let idx2 = stridx(line, 'o')
if idx1 != -1
call cursor(0, idx1 + 1)
else
call cursor(0, idx2 + 1)
endif
call s:GundoRenderPreview()
endfunction"}}}
"}}}
"{{{ Gundo rendering
function! s:GundoRenderGraph()"{{{
python GundoRenderGraph()
endfunction"}}}
function! s:GundoRenderPreview()"{{{
python GundoRenderPreview()
endfunction"}}}
function! s:GundoRenderChangePreview()"{{{
python GundoRenderChangePreview()
endfunction"}}}
"}}}
"{{{ Gundo undo/redo
function! s:GundoRevert()"{{{
python GundoRevert()
endfunction"}}}
function! s:GundoPlayTo()"{{{
python GundoPlayTo()
endfunction"}}}
"}}}
"{{{ Misc
function! gundo#GundoToggle()"{{{
call s:GundoToggle()
endfunction"}}}
function! gundo#GundoRenderGraph()"{{{
call s:GundoRenderGraph()
endfunction"}}}
augroup GundoAug
autocmd!
autocmd BufNewFile __Gundo__ call s:GundoSettingsGraph()
autocmd BufNewFile __Gundo_Preview__ call s:GundoSettingsPreview()
augroup END
"}}}

704
colors/lucius.vim
View File

@@ -1,6 +1,6 @@
" Lucius vim color file " Lucius vim color file
" Maintainer: Jonathan Filip <jfilip1024@gmail.com> " Maintainer: Jonathan Filip <jfilip1024@gmail.com>
" Version: 5.2 " Version: 6.0
hi clear hi clear
if exists("syntax_on") if exists("syntax_on")
@@ -9,14 +9,11 @@ endif
let colors_name="lucius" let colors_name="lucius"
" Summary: " Summary:
" Dark, light, and blue color schemes in one file (GUI and 256 color terminal). " Color scheme with dark and light versions (GUI and 256 color terminal).
" Description: " Description:
" This file contains three color schemes that focus on using blues and greens. " This color scheme was originally created by combining my favorite parts of
" " the following color schemes:
" The original dark color scheme started out by combining pieces of several
" other color schemes and has evolved into what it is today. Those color
" schemes are:
" "
" * oceandeep (vimscript #368) " * oceandeep (vimscript #368)
" * peaksea (vimscript #760) " * peaksea (vimscript #760)
@@ -24,20 +21,35 @@ let colors_name="lucius"
" * moria (vimscript #1464) " * moria (vimscript #1464)
" * zenburn (vimscript #415) " * zenburn (vimscript #415)
" "
" The default color scheme is the original, dark scheme. You can change this by " Version 6+ has been revamped a bit from the original color scheme. If you
" setting the g:lucius_style variable to "light", "dark", or "blue". Once the " prefer the old style, or the 'blue' version, use the 5Final release. Version
" color scheme is loaded, you can use the commands "LuciusLight", "LuciusDark", " 6+ only has a light and dark version. The new version tries to unify some of
" and "LuciusBlue" to change schemes quickly. " the colors and also adds more contrast between text and interface.
" "
" Screenshots of the different color schemes in a Windows 7 GUI: " The color scheme is dark, by default. You can change this by setting the
" g:lucius_style variable to "light" or "dark". Once the color scheme is
" loaded, you can use the commands "LuciusLight" or "LuciusDark" to change
" schemes quickly.
"
" Screeshots of the new version (6+):
"
" * Dark: http://i.imgur.com/IzYcB.png
" * Light: http://i.imgur.com/kfJcm.png
"
" Screenshots of the old versions (5Final):
" "
" * Dark: http://i.imgur.com/z0bDr.png " * Dark: http://i.imgur.com/z0bDr.png
" * Light: http://i.imgur.com/BXDiv.png " * Light: http://i.imgur.com/BXDiv.png
" * Blue: http://i.imgur.com/Ea1Gq.png " * Blue: http://i.imgur.com/Ea1Gq.png
" "
" colorsupport.vim (vimscript #2682) is used to help with mapping the GUI " colorsupport.vim (vimscript #2682) is used to help with mapping the GUI
" settings to the 256 terminal colors. " settings to the 256 terminal colors.
"
" This color scheme also has custom colors defined for the following plugins:
"
" * vimwiki (vimscript #2226)
" * tagbar (vimscript #3465)
"
" Installation: " Installation:
" Copy the file to your vim colors directory and then do :colorscheme lucius. " Copy the file to your vim colors directory and then do :colorscheme lucius.
@@ -50,578 +62,192 @@ else
let g:lucius_style="dark" let g:lucius_style="dark"
endif endif
" set colorcolumn=21,37,53,68,86,100
if g:lucius_style == "dark" if g:lucius_style == "dark"
hi Normal guifg=#e0e0e0 guibg=#202020
hi Normal ctermfg=253 ctermbg=234
hi Comment guifg=#606060 gui=none
hi Comment ctermfg=240 cterm=none
hi Constant guifg=#70c0d8 gui=none hi Normal guifg=#e8e8e8 guibg=#202020 ctermfg=253 ctermbg=234 gui=none cterm=none
hi Constant ctermfg=74 cterm=none
hi ConstantBold guifg=#70c0d8 gui=bold
hi ConstantBold ctermfg=74 cterm=bold
hi Identifier guifg=#86c6b6 gui=none hi Comment guifg=#606060 guibg=NONE ctermfg=240 ctermbg=NONE gui=none cterm=none
hi Identifier ctermfg=116 cterm=none
hi IdentifierBold guifg=#86c6b6 gui=bold
hi IdentifierBold ctermfg=116 cterm=bold
hi Statement guifg=#b3d38c gui=none hi Constant guifg=#b0d090 guibg=NONE ctermfg=150 ctermbg=NONE gui=none cterm=none
hi Statement ctermfg=150 cterm=none hi BConstant guifg=#b0d090 guibg=NONE ctermfg=150 ctermbg=NONE gui=bold cterm=bold
hi StatementBold guifg=#b3d38c gui=bold
hi StatementBold ctermfg=150 cterm=bold
hi PreProc guifg=#e0e8b0 gui=none hi Identifier guifg=#90d0c0 guibg=NONE ctermfg=115 ctermbg=NONE gui=none cterm=none
hi PreProc ctermfg=187 cterm=none hi BIdentifier guifg=#90d0c0 guibg=NONE ctermfg=115 ctermbg=NONE gui=bold cterm=bold
hi PreProcBold guifg=#e0e8b0 gui=bold
hi PreProcBold ctermfg=187 cterm=bold
hi Type guifg=#90d0a0 gui=none hi Statement guifg=#70c0e0 guibg=NONE ctermfg=74 ctermbg=NONE gui=none cterm=none
hi Type ctermfg=115 cterm=none hi BStatement guifg=#70c0e0 guibg=NONE ctermfg=74 ctermbg=NONE gui=bold cterm=bold
hi TypeBold guifg=#90d0a0 gui=bold
hi TypeBold ctermfg=115 cterm=bold
hi Special guifg=#b0a0c0 gui=none hi PreProc guifg=#e0e0b0 guibg=NONE ctermfg=187 ctermbg=NONE gui=none cterm=none
hi Special ctermfg=182 cterm=none hi BPreProc guifg=#e0e0b0 guibg=NONE ctermfg=187 ctermbg=NONE gui=bold cterm=bold
hi SpecialBold guifg=#b0a0c0 gui=bold
hi SpecialBold ctermfg=182 cterm=bold hi Type guifg=#90c0d0 guibg=NONE ctermfg=116 ctermbg=NONE gui=none cterm=none
hi BType guifg=#90c0d0 guibg=NONE ctermfg=116 ctermbg=NONE gui=bold cterm=bold
hi Special guifg=#b0a0c0 guibg=NONE ctermfg=182 ctermbg=NONE gui=none cterm=none
hi BSpecial guifg=#b0a0c0 guibg=NONE ctermfg=182 ctermbg=NONE gui=bold cterm=bold
" == Text Markup == " == Text Markup ==
" text that stands out, html links hi Underlined guifg=fg guibg=NONE ctermfg=fg ctermbg=NONE gui=underline cterm=underline
hi Underlined guifg=fg gui=underline hi Error guifg=#e07070 guibg=#402020 ctermfg=167 ctermbg=236 gui=none cterm=none
hi Underlined ctermfg=fg cterm=underline hi Todo guifg=#e0e090 guibg=#404000 ctermfg=186 ctermbg=NONE gui=none cterm=none
" any erroneous construct hi MatchParen guifg=bg guibg=#d0f080 ctermfg=bg ctermbg=192 gui=none cterm=bold
hi Error guifg=#e37170 guibg=#432323 gui=none hi NonText guifg=#405060 guibg=NONE ctermfg=24 ctermbg=NONE gui=none cterm=none
hi Error ctermfg=167 ctermbg=236 cterm=none hi SpecialKey guifg=#406050 guibg=NONE ctermfg=23 ctermbg=NONE gui=none cterm=none
" todo, fixme, note, xxx hi Title guifg=#60c0e0 guibg=NONE ctermfg=74 ctermbg=NONE gui=bold cterm=bold
hi Todo guifg=#e0e090 guibg=NONE gui=underline
hi Todo ctermfg=186 ctermbg=NONE cterm=underline
" match parenthesis, brackets
hi MatchParen guifg=#00ff00 guibg=NONE gui=bold
hi MatchParen ctermfg=46 ctermbg=NONE cterm=bold
" the '~' and '@' and showbreak, '>' double wide char doesn't fit on line
hi NonText guifg=#404040 gui=none
hi NonText ctermfg=238 cterm=none
" meta and special keys used with map, unprintable characters
hi SpecialKey guifg=#405060
hi SpecialKey ctermfg=239
" titles for output from :set all, :autocmd, etc
hi Title guifg=#62bdde gui=none
hi Title ctermfg=74 cterm=none
" == Text Selection == " == Text Selection ==
" character under the cursor hi Cursor guifg=bg guibg=fg ctermfg=bg ctermbg=fg gui=none cterm=none
hi Cursor guifg=bg guibg=#a3e3ed hi CursorIM guifg=bg guibg=fg ctermfg=bg ctermbg=fg gui=none cterm=none
hi Cursor ctermfg=bg ctermbg=153 hi CursorColumn guifg=NONE guibg=#404040 ctermfg=NONE ctermbg=237 gui=none cterm=none
" like cursor, but used when in IME mode hi CursorLine guifg=NONE guibg=#404040 ctermfg=NONE ctermbg=237 gui=none cterm=none
hi CursorIM guifg=bg guibg=#96cdcd hi Visual guifg=NONE guibg=#304050 ctermfg=NONE ctermbg=24 gui=none cterm=none
hi CursorIM ctermfg=bg ctermbg=116 hi VisualNOS guifg=fg guibg=NONE ctermfg=fg ctermbg=NONE gui=underline cterm=underline
" cursor column hi IncSearch guifg=bg guibg=#60e0e0 ctermfg=bg ctermbg=116 gui=none cterm=none
hi CursorColumn guifg=NONE guibg=#404448 gui=none hi Search guifg=bg guibg=#f0b030 ctermfg=bg ctermbg=214 gui=none cterm=none
hi CursorColumn ctermfg=NONE ctermbg=236 cterm=none
" cursor line/row
hi CursorLine guifg=NONE guibg=#404448 gui=none
hi CursorLine ctermfg=NONE ctermbg=236 cterm=none
" visual mode selection
hi Visual guifg=NONE guibg=#364458
hi Visual ctermfg=NONE ctermbg=24
" visual mode selection when vim is not owning the selection (x11 only)
hi VisualNOS guifg=fg gui=underline
hi VisualNOS ctermfg=fg cterm=underline
" highlight incremental search text; also highlight text replaced with :s///c
hi IncSearch guifg=#66ffff gui=reverse
hi IncSearch ctermfg=87 cterm=reverse
" hlsearch (last search pattern), also used for quickfix
hi Search guibg=#ffaa33 gui=none
hi Search ctermbg=214 cterm=none
" == UI == " == UI ==
" normal item in popup hi Pmenu guifg=bg guibg=#c0c0c0 ctermfg=bg ctermbg=252 gui=none cterm=none
hi Pmenu guifg=#e0e0e0 guibg=#303840 gui=none hi PmenuSel guifg=#e0e0e0 guibg=#304050 ctermfg=fg ctermbg=24 gui=none cterm=none
hi Pmenu ctermfg=253 ctermbg=233 cterm=none hi PMenuSbar guifg=#202020 guibg=#d0d0d0 ctermfg=bg ctermbg=254 gui=none cterm=none
" selected item in popup hi PMenuThumb guifg=NONE guibg=#808080 ctermfg=fg ctermbg=244 gui=none cterm=none
hi PmenuSel guifg=#cae682 guibg=#505860 gui=none hi StatusLine guifg=#202020 guibg=#c0c0c0 ctermfg=bg ctermbg=252 gui=bold cterm=bold
hi PmenuSel ctermfg=186 ctermbg=237 cterm=none hi StatusLineNC guifg=#404040 guibg=#c0c0c0 ctermfg=240 ctermbg=252 gui=none cterm=none
" scrollbar in popup hi TabLine guifg=#202020 guibg=#e0e0e0 ctermfg=bg ctermbg=252 gui=none cterm=none
hi PMenuSbar guibg=#505860 gui=none hi TabLineFill guifg=#404040 guibg=#e0e0e0 ctermfg=240 ctermbg=252 gui=none cterm=none
hi PMenuSbar ctermbg=59 cterm=none hi TabLineSel guifg=#e0e0e0 guibg=#304050 ctermfg=fg ctermbg=24 gui=bold cterm=bold
" thumb of the scrollbar in the popup hi VertSplit guifg=#606060 guibg=#c0c0c0 ctermfg=245 ctermbg=252 gui=none cterm=none
hi PMenuThumb guibg=#808890 gui=none hi Folded guifg=#202020 guibg=#808080 ctermfg=bg ctermbg=246 gui=none cterm=none
hi PMenuThumb ctermbg=102 cterm=none hi FoldColumn guifg=#202020 guibg=#808080 ctermfg=bg ctermbg=246 gui=none cterm=none
" status line for current window
hi StatusLine guifg=#e0e0e0 guibg=#363946 gui=bold
hi StatusLine ctermfg=254 ctermbg=237 cterm=bold
" status line for non-current windows
hi StatusLineNC guifg=#767986 guibg=#363946 gui=none
hi StatusLineNC ctermfg=244 ctermbg=237 cterm=none
" tab pages line, not active tab page label
hi TabLine guifg=#b6bf98 guibg=#363946 gui=none
hi TabLine ctermfg=244 ctermbg=236 cterm=none
" tab pages line, where there are no labels
hi TabLineFill guifg=#cfcfaf guibg=#363946 gui=none
hi TabLineFill ctermfg=187 ctermbg=236 cterm=none
" tab pages line, active tab page label
hi TabLineSel guifg=#efefef guibg=#414658 gui=bold
hi TabLineSel ctermfg=254 ctermbg=236 cterm=bold
" column separating vertically split windows
hi VertSplit guifg=#777777 guibg=#363946 gui=none
hi VertSplit ctermfg=243 ctermbg=237 cterm=none
" line used for closed folds
hi Folded guifg=#d0e0f0 guibg=#202020 gui=none
hi Folded ctermfg=117 ctermbg=235 cterm=none
" column on side used to indicated open and closed folds
hi FoldColumn guifg=#c0c0d0 guibg=#363946 gui=none
hi FoldColumn ctermfg=117 ctermbg=238 cterm=none
" == Spelling == " == Spelling ==
" word not recognized hi SpellBad guisp=#ee0000 ctermfg=fg ctermbg=160 gui=undercurl cterm=undercurl
hi SpellBad guisp=#ee0000 gui=undercurl hi SpellCap guisp=#eeee00 ctermfg=bg ctermbg=226 gui=undercurl cterm=undercurl
hi SpellBad ctermbg=196 cterm=undercurl hi SpellRare guisp=#ffa500 ctermfg=bg ctermbg=214 gui=undercurl cterm=undercurl
" word not capitalized hi SpellLocal guisp=#ffa500 ctermfg=bg ctermbg=214 gui=undercurl cterm=undercurl
hi SpellCap guisp=#eeee00 gui=undercurl
hi SpellCap ctermbg=226 cterm=undercurl
" rare word
hi SpellRare guisp=#ffa500 gui=undercurl
hi SpellRare ctermbg=214 cterm=undercurl
" wrong spelling for selected region
hi SpellLocal guisp=#ffa500 gui=undercurl
hi SpellLocal ctermbg=214 cterm=undercurl
" == Diff == " == Diff ==
" added line hi DiffAdd guifg=fg guibg=#304030 ctermfg=fg ctermbg=22 gui=none cterm=none
hi DiffAdd guifg=#80a090 guibg=#313c36 gui=none hi DiffChange guifg=fg guibg=#504030 ctermfg=fg ctermbg=58 gui=none cterm=none
hi DiffAdd ctermfg=fg ctermbg=22 cterm=none hi DiffDelete guifg=fg guibg=#403030 ctermfg=fg ctermbg=52 gui=none cterm=none
" changed line hi DiffText guifg=#d0c060 guibg=#504030 ctermfg=220 ctermbg=58 gui=bold cterm=bold
hi DiffChange guifg=NONE guibg=#4a343a gui=none
hi DiffChange ctermfg=fg ctermbg=52 cterm=none
" deleted line
hi DiffDelete guifg=#6c6661 guibg=#3c3631 gui=none
hi DiffDelete ctermfg=fg ctermbg=58 cterm=none
" changed text within line
hi DiffText guifg=#f05060 guibg=#4a343a gui=bold
hi DiffText ctermfg=203 ctermbg=52 cterm=bold
" == Misc == " == Misc ==
" directory names and other special names in listings hi Directory guifg=#c0e0b0 guibg=NONE ctermfg=151 ctermbg=NONE gui=none cterm=none
hi Directory guifg=#c0e0b0 gui=none hi ErrorMsg guifg=#ee0000 guibg=NONE ctermfg=196 ctermbg=NONE gui=none cterm=none
hi Directory ctermfg=151 cterm=none hi SignColumn guifg=#a0b0b0 guibg=#282828 ctermfg=145 ctermbg=233 gui=none cterm=none
" error messages on the command line hi LineNr guifg=#202020 guibg=#808080 ctermfg=bg ctermbg=246 gui=none cterm=none
hi ErrorMsg guifg=#ee0000 guibg=NONE gui=none hi MoreMsg guifg=#70d0f0 guibg=NONE ctermfg=117 ctermbg=NONE gui=none cterm=none
hi ErrorMsg ctermfg=196 ctermbg=NONE cterm=none hi ModeMsg guifg=fg guibg=NONE ctermfg=fg ctermbg=NONE gui=none cterm=none
" columns where signs are displayed (used in IDEs) hi Question guifg=fg guibg=NONE ctermfg=fg ctermbg=NONE gui=none cterm=none
hi SignColumn guifg=#9fafaf guibg=#181818 gui=none hi WarningMsg guifg=#e87870 guibg=NONE ctermfg=173 ctermbg=NONE gui=none cterm=none
hi SignColumn ctermfg=145 ctermbg=233 cterm=none hi WildMenu guifg=NONE guibg=#304050 ctermfg=NONE ctermbg=24 gui=none cterm=none
" line numbers hi ColorColumn guifg=NONE guibg=#403630 ctermfg=NONE ctermbg=101 gui=none cterm=none
hi LineNr guifg=#818698 guibg=#363946 hi Ignore guifg=bg ctermfg=bg
hi LineNr ctermfg=245 ctermbg=237
" the 'more' prompt when output takes more than one line
hi MoreMsg guifg=#2e8b57 gui=none
hi MoreMsg ctermfg=29 cterm=none
" text showing what mode you are in
hi ModeMsg guifg=#76d5f8 guibg=NONE gui=none
hi ModeMsg ctermfg=117 ctermbg=NONE cterm=none
" the hit-enter prompt (show more output) and yes/no questions
hi Question guifg=fg gui=none
hi Question ctermfg=fg cterm=none
" warning messages
hi WarningMsg guifg=#e5786d gui=none
hi WarningMsg ctermfg=173 cterm=none
" current match in the wildmenu completion
hi WildMenu guifg=#cae682 guibg=#363946 gui=bold,underline
hi WildMenu ctermfg=16 ctermbg=186 cterm=bold
" color column highlighting
hi ColorColumn guifg=NONE guibg=#403630 gui=none
hi ColorColumn ctermfg=NONE ctermbg=95 cterm=none
" left blank, hidden
hi Ignore guifg=bg
hi Ignore ctermfg=bg
elseif g:lucius_style == "light" elseif g:lucius_style == "light"
hi Normal guifg=#000000 guibg=#ffffff
hi Normal ctermfg=16 ctermbg=231
hi Comment guifg=#909090 gui=none
hi Comment ctermfg=246 cterm=none
hi Constant guifg=#008000 gui=none hi Normal guifg=#000000 guibg=#ffffff ctermfg=16 ctermbg=231 gui=none cterm=none
hi Constant ctermfg=28 cterm=none
hi ConstantBold guifg=#008000 gui=bold
hi ConstantBold ctermfg=28 cterm=bold
hi Identifier guifg=#008898 gui=none hi Comment guifg=#909090 guibg=NONE ctermfg=246 ctermbg=NONE gui=none cterm=none
hi Identifier ctermfg=30 cterm=none
hi IdentifierBold guifg=#008898 gui=bold
hi IdentifierBold ctermfg=30 cterm=bold
hi Statement guifg=#0050b0 gui=none hi Constant guifg=#007000 guibg=NONE ctermfg=22 ctermbg=NONE gui=none cterm=none
hi Statement ctermfg=25 cterm=none hi BConstant guifg=#007000 guibg=NONE ctermfg=22 ctermbg=NONE gui=none cterm=bold
hi StatementBold guifg=#0050b0 gui=bold
hi StatementBold ctermfg=25 cterm=bold
hi PreProc guifg=#b07000 gui=none hi Identifier guifg=#008080 guibg=NONE ctermfg=30 ctermbg=NONE gui=none cterm=none
hi PreProc ctermfg=130 cterm=none hi BIdentifier guifg=#008080 guibg=NONE ctermfg=30 ctermbg=NONE gui=none cterm=bold
hi PreProcBold guifg=#b07000 gui=bold
hi PreProcBold ctermfg=130 cterm=bold
hi Type guifg=#0070a0 gui=none hi Statement guifg=#0030b0 guibg=NONE ctermfg=19 ctermbg=NONE gui=none cterm=none
hi Type ctermfg=25 cterm=none hi BStatement guifg=#0030b0 guibg=NONE ctermfg=19 ctermbg=NONE gui=none cterm=bold
hi TypeBold guifg=#0070a0 gui=bold
hi TypeBold ctermfg=25 cterm=bold
hi Special guifg=#703080 gui=none hi PreProc guifg=#a06000 guibg=NONE ctermfg=130 ctermbg=NONE gui=none cterm=none
hi Special ctermfg=5 cterm=none hi BPreProc guifg=#a06000 guibg=NONE ctermfg=130 ctermbg=NONE gui=none cterm=bold
hi SpecialBold guifg=#703080 gui=bold
hi SpecialBold ctermfg=5 cterm=bold hi Type guifg=#0070a0 guibg=NONE ctermfg=25 ctermbg=NONE gui=none cterm=none
hi BType guifg=#0070a0 guibg=NONE ctermfg=25 ctermbg=NONE gui=none cterm=bold
hi Special guifg=#703080 guibg=NONE ctermfg=5 ctermbg=NONE gui=none cterm=none
hi BSpecial guifg=#703080 guibg=NONE ctermfg=5 ctermbg=NONE gui=none cterm=bold
" == Text Markup == " == Text Markup ==
" text that stands out, html links hi Underlined guifg=fg guibg=NONE ctermfg=fg ctermbg=NONE gui=underline cterm=underline
hi Underlined guifg=fg gui=underline hi Error guifg=#c02620 guibg=#f0c6c0 ctermfg=1 ctermbg=181 gui=none cterm=none
hi Underlined ctermfg=fg cterm=underline hi Todo guifg=#504000 guibg=#f6f080 ctermfg=58 ctermbg=228 gui=none cterm=none
" any erroneous construct hi MatchParen guifg=NONE guibg=#d0f080 ctermfg=NONE ctermbg=192 gui=none cterm=none
hi Error guifg=#c02020 guibg=#e0b0b0 gui=none hi NonText guifg=#b0c0d0 guibg=NONE ctermfg=146 ctermbg=NONE gui=none cterm=none
hi Error ctermfg=1 ctermbg=181 cterm=none hi SpecialKey guifg=#b0d0c0 guibg=NONE ctermfg=151 ctermbg=NONE gui=none cterm=none
" todo, fixme, note, xxx hi Title guifg=#0080e0 guibg=NONE ctermfg=26 ctermbg=NONE gui=bold cterm=bold
hi Todo guifg=#504000 guibg=#fff880 gui=underline
hi Todo ctermfg=58 ctermbg=228 cterm=underline
" match parenthesis, brackets
hi MatchParen guifg=NONE guibg=#a0f0b0 gui=none
hi MatchParen ctermfg=NONE ctermbg=157 cterm=bold
" the '~' and '@' and showbreak, '>' double wide char doesn't fit on line
hi NonText guifg=#b0c0d0 gui=none
hi NonText ctermfg=146 cterm=none
" meta and special keys used with map, unprintable characters
hi SpecialKey guifg=#b0d0c0
hi SpecialKey ctermfg=151
" titles for output from :set all, :autocmd, etc
hi Title guifg=#0080e0 gui=bold
hi Title ctermfg=32 cterm=bold
" == Text Selection == " == Text Selection ==
" character under the cursor hi Cursor guifg=bg guibg=#505050 ctermfg=bg ctermbg=239 gui=none cterm=none
hi Cursor guifg=bg guibg=#406090 hi CursorIM guifg=bg guibg=#505050 ctermfg=bg ctermbg=239 gui=none cterm=none
hi Cursor ctermfg=bg ctermbg=4 hi CursorColumn guifg=NONE guibg=#e8e8e8 ctermfg=NONE ctermbg=254 gui=none cterm=none
" like cursor, but used when in IME mode hi CursorLine guifg=NONE guibg=#e8e8e8 ctermfg=NONE ctermbg=254 gui=none cterm=none
hi CursorIM guifg=bg guibg=#96cdcd hi Visual guifg=NONE guibg=#d0e0f0 ctermfg=NONE ctermbg=153 gui=none cterm=none
hi CursorIM ctermfg=bg ctermbg=116 hi VisualNOS guifg=fg guibg=NONE ctermfg=fg ctermbg=NONE gui=underline cterm=underline
" cursor column hi IncSearch guifg=#000000 guibg=#90d0d0 ctermfg=fg ctermbg=116 gui=none cterm=none
hi CursorColumn guifg=NONE guibg=#e8e8e8 gui=none hi Search guifg=#000000 guibg=#f0b060 ctermfg=fg ctermbg=215 gui=none cterm=none
hi CursorColumn ctermfg=NONE ctermbg=254 cterm=none
" cursor line/row
hi CursorLine guifg=NONE guibg=#e8e8e8 gui=none
hi CursorLine ctermfg=NONE ctermbg=254 cterm=none
" visual mode selection
hi Visual guifg=NONE guibg=#d0e0f0
hi Visual ctermfg=NONE ctermbg=153
" visual mode selection when vim is not owning the selection (x11 only)
hi VisualNOS guifg=fg gui=underline
hi VisualNOS ctermfg=fg cterm=underline
" highlight incremental search text; also highlight text replaced with :s///c
hi IncSearch guifg=NONE guibg=#a0e0e0 gui=none
hi IncSearch ctermfg=NONE ctermbg=152 cterm=none
" hlsearch (last search pattern), also used for quickfix
hi Search guibg=#f0b060 gui=none
hi Search ctermbg=215 cterm=none
" == UI == " == UI ==
" normal item in popup hi Pmenu guifg=#ffffff guibg=#505050 ctermfg=231 ctermbg=239 gui=none cterm=none
hi Pmenu guifg=#000000 guibg=#e0e8f0 gui=none hi PmenuSel guifg=#000000 guibg=#d0e0f0 ctermfg=16 ctermbg=153 gui=none cterm=none
hi Pmenu ctermfg=NONE ctermbg=254 cterm=none hi PMenuSbar guifg=#ffffff guibg=#404040 ctermfg=231 ctermbg=238 gui=none cterm=none
" selected item in popup hi PMenuThumb guifg=#000000 guibg=#a0a0a0 ctermfg=16 ctermbg=247 gui=none cterm=none
hi PmenuSel guifg=#003050 guibg=#a0c0e0 gui=none hi StatusLine guifg=#ffffff guibg=#505050 ctermfg=231 ctermbg=239 gui=bold cterm=bold
hi PmenuSel ctermfg=23 ctermbg=251 cterm=none hi StatusLineNC guifg=#e0e0e0 guibg=#505050 ctermfg=254 ctermbg=239 gui=none cterm=none
" scrollbar in popup hi TabLine guifg=#ffffff guibg=#505050 ctermfg=231 ctermbg=239 gui=none cterm=none
hi PMenuSbar guibg=#d0d8e0 gui=none hi TabLineFill guifg=#a0a0a0 guibg=#505050 ctermfg=247 ctermbg=239 gui=none cterm=none
hi PMenuSbar ctermbg=188 cterm=none hi TabLineSel guifg=#000000 guibg=#d0e0f0 ctermfg=16 ctermbg=153 gui=none cterm=none
" thumb of the scrollbar in the popup hi VertSplit guifg=#868686 guibg=#505050 ctermfg=102 ctermbg=239 gui=none cterm=none
hi PMenuThumb guibg=#a0a8c0 gui=none hi Folded guifg=#ffffff guibg=#a0a0a0 ctermfg=231 ctermbg=247 gui=none cterm=none
hi PMenuThumb ctermbg=145 cterm=none hi FoldColumn guifg=#ffffff guibg=#a0a0a0 ctermfg=231 ctermbg=247 gui=none cterm=none
" status line for current window
hi StatusLine guifg=#000000 guibg=#90b0d0 gui=bold
hi StatusLine ctermfg=16 ctermbg=110 cterm=bold
" status line for non-current windows
hi StatusLineNC guifg=#305070 guibg=#90b0d0 gui=none
hi StatusLineNC ctermfg=239 ctermbg=110 cterm=none
" tab pages line, not active tab page label
hi TabLine guifg=#000000 guibg=#90b0d0 gui=none
hi TabLine ctermfg=16 ctermbg=110 cterm=none
" tab pages line, where there are no labels
hi TabLineFill guifg=#606060 guibg=#90b0d0 gui=none
hi TabLineFill ctermfg=59 ctermbg=110 cterm=none
" tab pages line, active tab page label
hi TabLineSel guifg=#007090 guibg=#90b0d0 gui=bold
hi TabLineSel ctermfg=24 ctermbg=110 cterm=bold
" column separating vertically split windows
hi VertSplit guifg=#708090 guibg=#90b0d0 gui=none
hi VertSplit ctermfg=66 ctermbg=110 cterm=none
" line used for closed folds
hi Folded guifg=#004080 guibg=#d0e0e0 gui=none
hi Folded ctermfg=24 ctermbg=253 cterm=none
" column on side used to indicated open and closed folds
hi FoldColumn guifg=#004080 guibg=#d0e0e0 gui=none
hi FoldColumn ctermfg=24 ctermbg=253 cterm=none
" == Spelling == " == Spelling ==
" word not recognized hi SpellBad guisp=#ee0000 ctermbg=210 gui=undercurl cterm=undercurl
hi SpellBad guisp=#ee0000 gui=undercurl hi SpellCap guisp=#eeee00 ctermbg=227 gui=undercurl cterm=undercurl
hi SpellBad ctermbg=210 cterm=undercurl hi SpellRare guisp=#ffa500 ctermbg=221 gui=undercurl cterm=undercurl
" word not capitalized hi SpellLocal guisp=#ffa500 ctermbg=221 gui=undercurl cterm=undercurl
hi SpellCap guisp=#eeee00 gui=undercurl
hi SpellCap ctermbg=227 cterm=undercurl
" rare word
hi SpellRare guisp=#ffa500 gui=undercurl
hi SpellRare ctermbg=221 cterm=undercurl
" wrong spelling for selected region
hi SpellLocal guisp=#ffa500 gui=undercurl
hi SpellLocal ctermbg=221 cterm=undercurl
" == Diff == " == Diff ==
" added line hi DiffAdd guifg=fg guibg=#d0e0d0 ctermfg=fg ctermbg=151: gui=none cterm=none
hi DiffAdd guifg=#205020 guibg=#a0d0a0 gui=none hi DiffChange guifg=fg guibg=#e0d6c0 ctermfg=fg ctermbg=187 gui=none cterm=none
hi DiffAdd ctermfg=fg ctermbg=151 cterm=none hi DiffDelete guifg=fg guibg=#f0d0d0 ctermfg=fg ctermbg=181 gui=none cterm=none
" changed line hi DiffText guifg=#c06000 guibg=#e0d6c0 ctermfg=166 ctermbg=187 gui=none cterm=bold
hi DiffChange guifg=#000000 guibg=#d0a0a0 gui=none
hi DiffChange ctermfg=fg ctermbg=181 cterm=none
" deleted line
hi DiffDelete guifg=#606060 guibg=#d0c0a0 gui=none
hi DiffDelete ctermfg=fg ctermbg=181 cterm=none
" changed text within line
hi DiffText guifg=#a04040 guibg=#d0a0a0 gui=bold
hi DiffText ctermfg=131 ctermbg=181 cterm=bold
" == Misc == " == Misc ==
" directory names and other special names in listings hi Directory guifg=#009040 guibg=NONE ctermfg=29 ctermbg=NONE gui=none cterm=none
hi Directory guifg=#00a080 gui=none hi ErrorMsg guifg=#a00000 guibg=NONE ctermfg=124 ctermbg=NONE gui=none cterm=none
hi Directory ctermfg=36 cterm=none hi SignColumn guifg=#708090 guibg=#f8f8f8 ctermfg=66 ctermbg=231 gui=none cterm=none
" error messages on the command line hi LineNr guifg=#ffffff guibg=#a0a0a0 ctermfg=231 ctermbg=247 gui=none cterm=none
hi ErrorMsg guifg=#aa0000 guibg=NONE gui=none hi MoreMsg guifg=#2060c0 guibg=NONE ctermfg=4 ctermbg=NONE gui=none cterm=none
hi ErrorMsg ctermfg=124 ctermbg=NONE cterm=none hi ModeMsg guifg=#000000 guibg=NONE ctermfg=16 ctermbg=NONE gui=none cterm=none
" columns where signs are displayed (used in IDEs) hi Question guifg=fg guibg=NONE ctermfg=NONE ctermbg=NONE gui=none cterm=none
hi SignColumn guifg=#708090 guibg=#f8f8f8 gui=none hi WarningMsg guifg=#d04020 guibg=NONE ctermfg=9 ctermbg=NONE gui=none cterm=none
hi SignColumn ctermfg=66 ctermbg=231 cterm=none hi WildMenu guifg=#000000 guibg=#d0e0f0 ctermfg=16 ctermbg=153 gui=none cterm=none
" line numbers hi ColorColumn guifg=NONE guibg=#f0f0e0 ctermfg=NONE ctermbg=230 gui=none cterm=none
hi LineNr guifg=#2060a0 guibg=#90b0d0 hi Ignore guifg=bg ctermfg=bg
hi LineNr ctermfg=4 ctermbg=110
" the 'more' prompt when output takes more than one line
hi MoreMsg guifg=#209020 gui=none
hi MoreMsg ctermfg=28 cterm=none
" text showing what mode you are in
hi ModeMsg guifg=#2060c0 guibg=NONE gui=none
hi ModeMsg ctermfg=4 ctermbg=NONE cterm=none
" the hit-enter prompt (show more output) and yes/no questions
hi Question guifg=fg gui=none
hi Question ctermfg=fg cterm=none
" warning messages
hi WarningMsg guifg=#e06020 gui=none
hi WarningMsg ctermfg=166 cterm=none
" current match in the wildmenu completion
hi WildMenu guifg=#000000 guibg=#a0f0b0 gui=bold
hi WildMenu ctermfg=24 ctermbg=110 cterm=bold
" color column highlighting
hi ColorColumn guifg=NONE guibg=#f0f0e0 gui=none
hi ColorColumn ctermfg=NONE ctermbg=224 cterm=none
" left blank, hidden
hi Ignore guifg=bg
hi Ignore ctermfg=bg
elseif g:lucius_style == "blue"
hi Normal guifg=#e0e0e0 guibg=#102030
hi Normal ctermfg=253 ctermbg=234
hi Comment guifg=#506070 gui=none
hi Comment ctermfg=59 cterm=none
hi Constant guifg=#90d0a0 gui=none
hi Constant ctermfg=115 cterm=none
hi ConstantBold guifg=#90d0a0 gui=bold
hi ConstantBold ctermfg=115 cterm=bold
hi Identifier guifg=#a0d0c0 gui=none
hi Identifier ctermfg=151 cterm=none
hi IdentifierBold guifg=#a0d0c0 gui=bold
hi IdentifierBold ctermfg=151 cterm=bold
hi Statement guifg=#90d0e0 gui=none
hi Statement ctermfg=117 cterm=none
hi StatementBold guifg=#b3d38c gui=bold
hi StatementBold ctermfg=117 cterm=bold
hi PreProc guifg=#e0e0b0 gui=none
hi PreProc ctermfg=187 cterm=none
hi PreProcBold guifg=#d0d0a0 gui=bold
hi PreProcBold ctermfg=187 cterm=bold
hi Type guifg=#90d0d0 gui=none
hi Type ctermfg=116 cterm=none
hi TypeBold guifg=#80c0c0 gui=bold
hi TypeBold ctermfg=116 cterm=bold
hi Special guifg=#b0b0d0 gui=none
hi Special ctermfg=146 cterm=none
hi SpecialBold guifg=#a0a0c0 gui=bold
hi SpecialBold ctermfg=146 cterm=bold
" == Text Markup ==
" text that stands out, html links
hi Underlined guifg=fg gui=underline
hi Underlined ctermfg=fg cterm=underline
" any erroneous construct
hi Error guifg=#e07078 guibg=#402028 gui=none
hi Error ctermfg=167 ctermbg=52 cterm=none
" todo, fixme, note, xxx
hi Todo guifg=#e0e090 guibg=#505000 gui=underline
hi Todo ctermfg=186 ctermbg=58 cterm=underline
" match parenthesis, brackets
hi MatchParen guifg=#00ff00 guibg=NONE gui=bold
hi MatchParen ctermfg=46 ctermbg=NONE cterm=bold
" the '~' and '@' and showbreak, '>' double wide char doesn't fit on line
hi NonText guifg=#406050 gui=none
hi NonText ctermfg=238 cterm=none
" meta and special keys used with map, unprintable characters
hi SpecialKey guifg=#505050
hi SpecialKey ctermfg=239
" titles for output from :set all, :autocmd, etc
hi Title guifg=#00e0a0 gui=none
hi Title ctermfg=43 cterm=none
" == Text Selection ==
" character under the cursor
hi Cursor guifg=bg guibg=#a0e0f0
hi Cursor ctermfg=bg ctermbg=153
" like cursor, but used when in IME mode
hi CursorIM guifg=bg guibg=#90c0c0
hi CursorIM ctermfg=bg ctermbg=116
" cursor column
hi CursorColumn guifg=NONE guibg=#283848 gui=none
hi CursorColumn ctermfg=NONE ctermbg=236 cterm=none
" cursor line/row
hi CursorLine guifg=NONE guibg=#283848 gui=none
hi CursorLine ctermfg=NONE ctermbg=236 cterm=none
" visual mode selection
hi Visual guifg=NONE guibg=#204050
hi Visual ctermfg=NONE ctermbg=24
" visual mode selection when vim is not owning the selection (x11 only)
hi VisualNOS guifg=fg gui=underline
hi VisualNOS ctermfg=fg cterm=underline
" highlight incremental search text; also highlight text replaced with :s///c
hi IncSearch guifg=#60f0f0 gui=reverse
hi IncSearch ctermfg=87 cterm=reverse
" hlsearch (last search pattern), also used for quickfix
hi Search guibg=#f0b030 gui=none
hi Search ctermfg=0 ctermbg=214 cterm=none
" == UI ==
" normal item in popup
hi Pmenu guifg=#e0e0e0 guibg=#305060 gui=none
hi Pmenu ctermfg=253 ctermbg=233 cterm=none
" selected item in popup
hi PmenuSel guifg=#80f0b0 guibg=#406070 gui=none
hi PmenuSel ctermfg=186 ctermbg=237 cterm=none
" scrollbar in popup
hi PMenuSbar guibg=#406070 gui=none
hi PMenuSbar ctermbg=59 cterm=none
" thumb of the scrollbar in the popup
hi PMenuThumb guibg=#4090a0 gui=none
hi PMenuThumb ctermbg=102 cterm=none
" status line for current window
hi StatusLine guifg=#e0e0e0 guibg=#405060 gui=bold
hi StatusLine ctermfg=254 ctermbg=237 cterm=bold
" status line for non-current windows
hi StatusLineNC guifg=#8090a0 guibg=#405060 gui=none
hi StatusLineNC ctermfg=244 ctermbg=237 cterm=none
" tab pages line, not active tab page label
hi TabLine guifg=#b6bf98 guibg=#405060 gui=none
hi TabLine ctermfg=244 ctermbg=236 cterm=none
" tab pages line, where there are no labels
hi TabLineFill guifg=#cfcfaf guibg=#405060 gui=none
hi TabLineFill ctermfg=187 ctermbg=236 cterm=none
" tab pages line, active tab page label
hi TabLineSel guifg=#efefef guibg=#405060 gui=bold
hi TabLineSel ctermfg=254 ctermbg=236 cterm=bold
" column separating vertically split windows
hi VertSplit guifg=#8090a0 guibg=#405060 gui=none
hi VertSplit ctermfg=242 ctermbg=237 cterm=none
" line used for closed folds
hi Folded guifg=#d0e0f0 guibg=#102030 gui=none
hi Folded ctermfg=117 ctermbg=235 cterm=none
" column on side used to indicated open and closed folds
hi FoldColumn guifg=#c0c0d0 guibg=#405060 gui=none
hi FoldColumn ctermfg=117 ctermbg=238 cterm=none
" == Spelling ==
" word not recognized
hi SpellBad guisp=#ee0000 gui=undercurl
hi SpellBad ctermbg=196 cterm=undercurl
" word not capitalized
hi SpellCap guisp=#eeee00 gui=undercurl
hi SpellCap ctermbg=226 cterm=undercurl
" rare word
hi SpellRare guisp=#ffa500 gui=undercurl
hi SpellRare ctermbg=214 cterm=undercurl
" wrong spelling for selected region
hi SpellLocal guisp=#ffa500 gui=undercurl
hi SpellLocal ctermbg=214 cterm=undercurl
" == Diff ==
" added line
hi DiffAdd guifg=#80a090 guibg=#313c36 gui=none
hi DiffAdd ctermfg=fg ctermbg=22 cterm=none
" changed line
hi DiffChange guifg=NONE guibg=#4a343a gui=none
hi DiffChange ctermfg=fg ctermbg=52 cterm=none
" deleted line
hi DiffDelete guifg=#6c6661 guibg=#3c3631 gui=none
hi DiffDelete ctermfg=fg ctermbg=58 cterm=none
" changed text within line
hi DiffText guifg=#f05060 guibg=#4a343a gui=bold
hi DiffText ctermfg=203 ctermbg=52 cterm=bold
" == Misc ==
" directory names and other special names in listings
hi Directory guifg=#c0e0b0 gui=none
hi Directory ctermfg=151 cterm=none
" error messages on the command line
hi ErrorMsg guifg=#ee0000 guibg=NONE gui=none
hi ErrorMsg ctermfg=196 ctermbg=NONE cterm=none
" columns where signs are displayed (used in IDEs)
hi SignColumn guifg=#9fafaf guibg=#102030 gui=none
hi SignColumn ctermfg=145 ctermbg=233 cterm=none
" line numbers
hi LineNr guifg=#a0b0c0 guibg=#405060
hi LineNr ctermfg=245 ctermbg=237
" the 'more' prompt when output takes more than one line
hi MoreMsg guifg=#2e8b57 gui=none
hi MoreMsg ctermfg=29 cterm=none
" text showing what mode you are in
hi ModeMsg guifg=#76d5f8 guibg=NONE gui=none
hi ModeMsg ctermfg=117 ctermbg=NONE cterm=none
" the hit-enter prompt (show more output) and yes/no questions
hi Question guifg=fg gui=none
hi Question ctermfg=fg cterm=none
" warning messages
hi WarningMsg guifg=#e5786d gui=none
hi WarningMsg ctermfg=173 cterm=none
" current match in the wildmenu completion
hi WildMenu guifg=#cae682 guibg=#405060 gui=bold,underline
hi WildMenu ctermfg=16 ctermbg=186 cterm=bold
" color column highlighting
hi ColorColumn guifg=NONE guibg=#403040 gui=none
hi ColorColumn ctermfg=NONE ctermbg=95 cterm=none
" left blank, hidden
hi Ignore guifg=bg
hi Ignore ctermfg=bg
endif endif
" == Vimwiki Colors == " == Vimwiki Colors ==
hi link VimwikiHeader1 PreProcBold hi link VimwikiHeader1 BConstant
hi link VimwikiHeader2 ConstantBold hi link VimwikiHeader2 BIdentifier
hi link VimwikiHeader3 StatementBold hi link VimwikiHeader3 BStatement
hi link VimwikiHeader4 IdentifierBold hi link VimwikiHeader4 BSpecial
hi link VimwikiHeader5 SpecialBold hi link VimwikiHeader5 BPreProc
hi link VimwikiHeader6 TypeBold hi link VimwikiHeader6 BType
" == Tagbar Colors ==
hi link TagbarAccessPublic Constant
hi link TagbarAccessProtected Type
hi link TagbarAccessPrivate PreProc
" == Commands == " == Commands ==
command! LuciusLight let g:lucius_style = "light" | colorscheme lucius command! LuciusLight let g:lucius_style = "light" | colorscheme lucius
command! LuciusDark let g:lucius_style = "dark" | colorscheme lucius command! LuciusDark let g:lucius_style = "dark" | colorscheme lucius
command! LuciusBlue let g:lucius_style = "blue" | colorscheme lucius

2
doc/gundo.txt
View File

@@ -219,6 +219,8 @@ GitHub: http://github.com/sjl/gundo.vim/
============================================================================== ==============================================================================
7. Changelog *GundoChangelog* 7. Changelog *GundoChangelog*
v2.2.2
* More performance improvements.
v2.2.1 v2.2.1
* Refactoring and performance improvements. * Refactoring and performance improvements.
v2.2.0 v2.2.0

42
plugin/DirDiff.vim
View File

@@ -1,9 +1,9 @@
" -*- vim -*- " -*- vim -*-
" FILE: "/home/wlee/.vim/plugin/DirDiff.vim" {{{ " FILE: "/home/wlee/.vim/plugin/DirDiff.vim" {{{
" LAST MODIFICATION: "Mon, 20 Oct 2008 09:04:59 -0500 (wlee)" " LAST MODIFICATION: "Fri, 29 Jul 2011 08:30:07 -0500 (wlee)"
" HEADER MAINTAINED BY: N/A " HEADER MAINTAINED BY: N/A
" VERSION: 1.1.3 " VERSION: 1.1.4
" (C) 2001-2010 by William Lee, <wl1012@yahoo.com> " (C) 2001-2011 by William Lee, <wl1012@yahoo.com>
" }}} " }}}
@@ -116,7 +116,7 @@
" William Lee <wl1012@yahoo.com> " William Lee <wl1012@yahoo.com>
" "
" LICENSE: " LICENSE:
" Copyright (c) 2001-2006 William Lee " Copyright (c) 2001-2011 William Lee
" All rights reserved. " All rights reserved.
" "
" Redistribution and use in source and binary forms, with or without " Redistribution and use in source and binary forms, with or without
@@ -151,6 +151,7 @@
" Salman Halim, Yosuke Kimura, and others for their suggestions " Salman Halim, Yosuke Kimura, and others for their suggestions
" "
" HISTORY: " HISTORY:
" 1.1.4 - Fixed split windows problems caused by some .vimrc settings.
" 1.1.3 - Applied the patch to 1.1.2 by Wu WeiWei in order to make diff " 1.1.3 - Applied the patch to 1.1.2 by Wu WeiWei in order to make diff
" that's localized in Chinese work. " that's localized in Chinese work.
" 1.1.2 - Applied the patch to 1.1.0 instead of 1.0.2. Please do not use " 1.1.2 - Applied the patch to 1.1.0 instead of 1.0.2. Please do not use
@@ -386,7 +387,7 @@ function! <SID>DirDiff(srcA, srcB)
echo "Diffing directories, it may take a while..." echo "Diffing directories, it may take a while..."
let error = <SID>DirDiffExec(cmd, 0) let error = <SID>DirDiffExec(cmd, 0)
if (error == 0) if (error == 0)
echo "There is no diff here." redraw | echom "diff found no differences - directories match."
return return
endif endif
silent exe "edit ".DiffBuffer silent exe "edit ".DiffBuffer
@@ -513,6 +514,17 @@ function! <SID>CloseDiffWindows()
endif endif
endfunction endfunction
function! <SID>EscapeFileName(path)
if (v:version >= 702)
return fnameescape(a:path)
else
" This is not a complete list of escaped character, so it's
" not as sophisicated as the fnameescape, but this should
" cover most of the cases and should work for Vim version <
" 7.2
return escape(a:path, " \t\n*?[{`$\\%#'\"|!<")
endif
endfunction
function! <SID>DirDiffOpen() function! <SID>DirDiffOpen()
" First dehighlight the last marked " First dehighlight the last marked
@@ -526,8 +538,15 @@ function! <SID>DirDiffOpen()
let dirA = <SID>GetBaseDir("A") let dirA = <SID>GetBaseDir("A")
let dirB = <SID>GetBaseDir("B") let dirB = <SID>GetBaseDir("B")
" Save the number of this window, to which we wish to return
" This is required in case there are other windows open
let thisWindow = winnr()
call <SID>CloseDiffWindows() call <SID>CloseDiffWindows()
" Ensure we're in the right window
exec thisWindow.'wincmd w'
let line = getline(".") let line = getline(".")
" Parse the line and see whether it's a "Only in" or "Files Differ" " Parse the line and see whether it's a "Only in" or "Files Differ"
call <SID>HighlightLine() call <SID>HighlightLine()
@@ -543,7 +562,7 @@ function! <SID>DirDiffOpen()
endif endif
split split
wincmd k wincmd k
silent exec "edit ".fnameescape(fileToOpen) silent exec "edit ". <SID>EscapeFileName(fileToOpen)
" Fool the window saying that this is diff " Fool the window saying that this is diff
diffthis diffthis
wincmd j wincmd j
@@ -554,8 +573,15 @@ function! <SID>DirDiffOpen()
"Open the diff windows "Open the diff windows
split split
wincmd k wincmd k
silent exec "edit ".fnameescape(fileB) silent exec "edit ".<SID>EscapeFileName(fileB)
silent exec "vert diffsplit ".fnameescape(fileA)
" To ensure that A is on the left and B on the right, splitright must be off
" let saved_splitright = &splitright
" set nosplitright
" silent exec "vert diffsplit ".<SID>EscapeFileName(fileA)
" let &splitright = saved_splitright
silent exec "leftabove vert diffsplit ".<SID>EscapeFileName(fileA)
" Go back to the diff window " Go back to the diff window
wincmd j wincmd j
" Resize the window " Resize the window

2
plugin/buffergator.vim
View File

@@ -772,7 +772,7 @@ function! s:NewCatalogViewer()
let b:buffergator_last_render_time = localtime() let b:buffergator_last_render_time = localtime()
try try
" remove extra last line " remove extra last line
execute("normal! GVX") execute('normal! GV"_X')
catch // catch //
endtry endtry
setlocal nomodifiable setlocal nomodifiable

15
plugin/gundo.py
View File

@@ -14,7 +14,8 @@ import sys
import time import time
import vim import vim
# Mercurial's graphlog code
# Mercurial's graphlog code --------------------------------------------------------
def asciiedges(seen, rev, parents): def asciiedges(seen, rev, parents):
"""adds edge info to changelog DAG walk suitable for ascii()""" """adds edge info to changelog DAG walk suitable for ascii()"""
if rev not in seen: if rev not in seen:
@@ -193,8 +194,8 @@ def generate(dag, edgefn, current):
ascii(buf, state, 'C', char, [line], edgefn(seen, node, parents)) ascii(buf, state, 'C', char, [line], edgefn(seen, node, parents))
return buf.b return buf.b
# Mercurial age function
# Mercurial age function -----------------------------------------------------------
agescales = [("year", 3600 * 24 * 365), agescales = [("year", 3600 * 24 * 365),
("month", 3600 * 24 * 30), ("month", 3600 * 24 * 30),
("week", 3600 * 24 * 7), ("week", 3600 * 24 * 7),
@@ -227,8 +228,8 @@ def age(ts):
if n >= 2 or s == 1: if n >= 2 or s == 1:
return '%s ago' % fmt(t, n) return '%s ago' % fmt(t, n)
# Python Vim utility functions
# Python Vim utility functions -----------------------------------------------------
normal = lambda s: vim.command('normal %s' % s) normal = lambda s: vim.command('normal %s' % s)
MISSING_BUFFER = "Cannot find Gundo's target buffer (%s)" MISSING_BUFFER = "Cannot find Gundo's target buffer (%s)"
@@ -278,8 +279,8 @@ INLINE_HELP = '''\
''' '''
# Python undo tree data structures and functions
# Python undo tree data structures and functions -----------------------------------
class Buffer(object): class Buffer(object):
def __init__(self): def __init__(self):
self.b = '' self.b = ''
@@ -325,10 +326,10 @@ def changenr(nodes):
current = int(vim.eval('changenr()')) current = int(vim.eval('changenr()'))
return current return current
# Gundo rendering
# Gundo rendering ------------------------------------------------------------------
# Rendering utility functions # Rendering utility functions
def _fmt_time(t): def _fmt_time(t):
return time.strftime('%Y-%m-%d %I:%M:%S %p', time.localtime(float(t))) return time.strftime('%Y-%m-%d %I:%M:%S %p', time.localtime(float(t)))
@@ -499,8 +500,8 @@ def GundoRenderChangePreview():
_goto_window_for_buffer_name('__Gundo__') _goto_window_for_buffer_name('__Gundo__')
# Gundo undo/redo
# Gundo undo/redo
def GundoRevert(): def GundoRevert():
if not _check_sanity(): if not _check_sanity():
return return