Merge remote-tracking branch 'origin/master'

vimrc

@@ -126,8 +126,6 @@ endif
 
 set bg=dark
 
-call togglebg#map("<F10>")
-
 " use solarized colorscheme if the terminal can support it (or we're in a GUI)
 let g:solarized_termtrans = 1
 let g:solarized_visibility = 'low'
@@ -163,6 +161,11 @@ nnoremap <C-j> <C-w>j
 nnoremap <C-k> <C-w>k
 nnoremap <C-l> <C-w>l
 
+" Usual EMACS (oh the horror!) begin-line and end-line keys for first and last
+" buffer.
+"nnoremap <silent> <C-a> :bfirst<CR>
+"nnoremap <silent> <C-e> :blast<CR>
+" Move between buffers with <C-n> and <C-p>
 nnoremap <silent> <C-n> :bn<CR>
 nnoremap <silent> <C-p> :bp<CR>
 
@@ -180,6 +183,7 @@ function! <SID>strip_trailing_whitespace()
     call cursor(l, c)
 endfunction
 
+
 function! <SID>FindProjectFileOrDirectory(fod)
     let l:dir = getcwd()
     " Search up the path, starting at the current working directory, for the
@@ -194,14 +198,17 @@ function! <SID>FindProjectFileOrDirectory(fod)
     return ""
 endfunction
 
+
 function! GetProjectRuntimeDirectory()
     return <SID>FindProjectFileOrDirectory("vim")
 endfunction
 
+
 function! GetProjectFile()
     return <SID>FindProjectFileOrDirectory("project.vim")
 endfunction
 
+
 function! <SID>SourceProjectFile()
     let l:project_file = GetProjectFile()
     if l:project_file != ""
@@ -209,6 +216,7 @@ function! <SID>SourceProjectFile()
     endif
 endfunction
 
+
 function! <SID>AddProjectRuntimeDirectory()
     let l:project_rtp = GetProjectRuntimeDirectory()
     if isdirectory(l:project_rtp)
@@ -259,6 +267,11 @@ nmap gV `[v`]
 "let g:CommandTAcceptSelectionMap='<C-b>'
 "let g:CommandTAcceptSelectionTabMap='<CR>'
 
+" GitGutter shows changed lines in files.
+let g:gitgutter_enabled = 0
+highlight clear SignColumn
+nmap <silent> <leader>gg :ToggleGitGutter<CR>
+
 if has('autocmd')
     filetype plugin indent on