Merge commit '528a59f26d12278698bb946f8fb82a63711eec21'

This commit is contained in:
Ethan Schoonover 2011-05-09 14:45:24 -07:00
commit 856f366dcb

View file

@ -1027,14 +1027,14 @@ if !exists(":SolarizedOptions")
endif endif
function! SolarizedMenu() function! SolarizedMenu()
if exists("g:loaded_solarized_menu") if exists("g:loaded_solarized_menu")
try try
silent! aunmenu Solarized silent! aunmenu Solarized
endtry endtry
endif endif
let g:loaded_solarized_menu = 1 let g:loaded_solarized_menu = 1
if g:colors_name == "solarized" && g:solarized_menu != 0 if g:colors_name == "solarized" && g:solarized_menu != 0
amenu &Solarized.&Contrast.&Low\ Contrast :let g:solarized_contrast="low" \| colorscheme solarized<CR> amenu &Solarized.&Contrast.&Low\ Contrast :let g:solarized_contrast="low" \| colorscheme solarized<CR>
amenu &Solarized.&Contrast.&Normal\ Contrast :let g:solarized_contrast="normal" \| colorscheme solarized<CR> amenu &Solarized.&Contrast.&Normal\ Contrast :let g:solarized_contrast="normal" \| colorscheme solarized<CR>
@ -1084,7 +1084,7 @@ if g:colors_name == "solarized" && g:solarized_menu != 0
an 9999.78 &Help.&Toggle\ Background :help togglebg<CR> an 9999.78 &Help.&Toggle\ Background :help togglebg<CR>
an 9999.79 &Help.-sep3- <Nop> an 9999.79 &Help.-sep3- <Nop>
endif endif
endfunction endfunction
autocmd ColorScheme * if g:colors_name != "solarized" | silent! aunmenu Solarized | else | call SolarizedMenu() | endif autocmd ColorScheme * if g:colors_name != "solarized" | silent! aunmenu Solarized | else | call SolarizedMenu() | endif