dotfiles · commit

Fix vimdiff

d9064406b3258ca837fd25b5537e13ff562b9ed4

Alexis Sellier committed 10 years ago 1 parent d6704787

.vimrc +12 -0

set undofile
set gdefault                        " Always use /g with %s/
set colorcolumn=80
set list
set listchars=tab:·\ ,eol:¬,trail:█
set fillchars=diff:\ ,vert:│
set diffopt=filler,vertical,foldcolumn:0
set lazyredraw                      " Stop vim from freaking out all the time
set statusline=%<%f\ %h%m%r%=%{Hi()}\ %y\ \ %-14(%{&sw}:%{&sts}:%{&ts}%)%-14.(%l,%c%V%)\ %P

" We don't use tabs much, but at least try and show less cruft
function! Tabline()

nnoremap c*              *Ncgn
nnoremap <Leader>h       :nohl<CR>

" Git
nnoremap <Leader>gc     :Gcommit -v<CR>
nnoremap <Leader>gc.    :Gwrite <Bar> Gcommit -v<CR>
nnoremap <Leader>gca    :Git commit -a<CR>
nnoremap <Leader>ga     :GitGutterStageHunk<CR>
nnoremap <Leader>ga.    :Gwrite<CR>
nnoremap <Leader>gu     :GitGutterUndoHunk<CR>
nnoremap <Leader>gp     :GitGutterPreviewHunk<CR>
nnoremap <Leader>n      :cnext<CR>

  profile stop
  tabnew profile
endfunction

" Get highlight group under cursor
command! Hi call s:ToggleHi()
function! s:ToggleHi()
  if exists('g:show_hi')
    unlet g:show_hi
  else
    let g:show_hi = 1
  endif
endfunction
function! Hi()
  if exists('g:show_hi')
    return synIDattr(synID(line("."), col("."), 1), "name")
  endif
  return ''

183	185		nnoremap c* *Ncgn
184	186		nnoremap <Leader>h :nohl<CR>
185	187
186	188		" Git
187	189		nnoremap <Leader>gc :Gcommit -v<CR>
	190	+	nnoremap <Leader>gc. :Gwrite <Bar> Gcommit -v<CR>
	191	+	nnoremap <Leader>gca :Git commit -a<CR>
188	192		nnoremap <Leader>ga :GitGutterStageHunk<CR>
189	193		nnoremap <Leader>ga. :Gwrite<CR>
190	194		nnoremap <Leader>gu :GitGutterUndoHunk<CR>
191	195		nnoremap <Leader>gp :GitGutterPreviewHunk<CR>
192	196		nnoremap <Leader>n :cnext<CR>

243	247		profile stop
244	248		tabnew profile
245	249		endfunction
246	250
247	251		" Get highlight group under cursor
	252	+	command! Hi call s:ToggleHi()
	253	+	function! s:ToggleHi()
	254	+	if exists('g:show_hi')
	255	+	unlet g:show_hi
	256	+	else
	257	+	let g:show_hi = 1
	258	+	endif
	259	+	endfunction
248	260		function! Hi()
249	261		if exists('g:show_hi')
250	262		return synIDattr(synID(line("."), col("."), 1), "name")
251	263		endif
252	264		return ''

48	48		set undofile
49	49		set gdefault " Always use /g with %s/
50	50		set colorcolumn=80
51	51		set list
52	52		set listchars=tab:·\ ,eol:¬,trail:█
	53	+	set fillchars=diff:\ ,vert:│
	54	+	set diffopt=filler,vertical,foldcolumn:0
53	55		set lazyredraw " Stop vim from freaking out all the time
54	56		set statusline=%<%f\ %h%m%r%=%{Hi()}\ %y\ \ %-14(%{&sw}:%{&sts}:%{&ts}%)%-14.(%l,%c%V%)\ %P
55	57
56	58		" We don't use tabs much, but at least try and show less cruft
57	59		function! Tabline()