Merge branch 'master' of github.com:uvaes/dotfiles

Conflicts:
	offlineimaprc

2 files changed, 14 insertions, 15 deletions

diff --git a/offlineimaprc b/offlineimaprc
index 15d95bb..8b2c786 100644
--- a/offlineimaprc
+++ b/offlineimaprc
@@ -92,7 +92,6 @@ nametrans      = lambda folder: {'INBOX' : 'Gmail'}.get(folder, folder)
 folderfilter   = lambda folder: folder in ['INBOX']
 sslcacertfile  = /etc/ssl/certs/ca-certificates.crt
 
-
 [mbnames]
 enabled  = yes
 filename = ~/.mutt/mailboxes
diff --git a/vim/vimrc b/vim/vimrc
index e6cf74d..6a171d8 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -135,20 +135,20 @@ set encoding=utf-8
 set mouse=a
 
 ""  Colorscheme
-function! UpdateColorscheme()
-    try | colorscheme solarized | catch | endtry
-    if strftime("%H") >= 8 && strftime("%H") < 21
-        set background=light
-    else
-        set background=dark
-    endif
-
-    hi Cursor guifg=white guibg=blue
-    hi iCursor guifg=black guibg=green
-    hi! link conceal normal
-    hi! link folded comment
-endfunction
-autocmd! BufNewFile,BufRead,BufWrite * :call UpdateColorscheme()
+try | colorscheme solarized | catch | endtry
+" function! UpdateColorscheme()
+"     if strftime("%H") >= 8 && strftime("%H") < 21
+"         set background=light
+"     else
+"         set background=dark
+"     endif
+
+"     hi Cursor guifg=white guibg=blue
+"     hi iCursor guifg=black guibg=green
+"     hi! link conceal normal
+"     hi! link folded comment
+" endfunction
+" autocmd! BufNewFile,BufRead,BufWrite * :call UpdateColorscheme()
 
 ""  Custom mappings