269 " Jump to last known pos |
269 " Jump to last known pos |
270 autocmd BufReadPost * |
270 autocmd BufReadPost * |
271 \ if &filetype !~# 'mail\|^git\|^hg' && line("'\"") >= 1 && line("'\"") <= line("$") | |
271 \ if &filetype !~# 'mail\|^git\|^hg' && line("'\"") >= 1 && line("'\"") <= line("$") | |
272 \ exe "normal! g`\"" | |
272 \ exe "normal! g`\"" | |
273 \ endif |
273 \ endif |
|
274 |
|
275 " Simple highlight conflict markers |
|
276 autocmd BufReadPost * |
|
277 \ syn match Error "^\(<\|>\||\)\1\{6,7}" | |
|
278 \ syn match Error "^=\{7,8}$" |
274 |
279 |
275 " double-click to edit in vimfiler |
280 " double-click to edit in vimfiler |
276 autocmd FileType vimfiler nmap <buffer> <2-LeftMouse> <Plug>(vimfiler_edit_file) |
281 autocmd FileType vimfiler nmap <buffer> <2-LeftMouse> <Plug>(vimfiler_edit_file) |
277 |
282 |
278 " Simplify noisy ltag output |
283 " Simplify noisy ltag output |