Fix displaying git branch
This commit is contained in:
parent
711d9eaf69
commit
487b2f18a2
2 changed files with 17 additions and 8 deletions
|
@ -1,5 +1,7 @@
|
||||||
" === Пользовательские функции ===
|
" === Пользовательские функции ===
|
||||||
"Функция получения текущего режима редактора
|
"Функция получения текущего режима редактора
|
||||||
|
let g:git_branch = ""
|
||||||
|
|
||||||
function justmyrc#GetMode()
|
function justmyrc#GetMode()
|
||||||
let l:editor_mode = mode()
|
let l:editor_mode = mode()
|
||||||
|
|
||||||
|
@ -38,10 +40,9 @@ function justmyrc#GetMode()
|
||||||
endif
|
endif
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function justmyrc#GetBranchName()
|
function justmyrc#GetBranchName(filename)
|
||||||
let l:status = trim(system("git rev-parse --abbrev-ref HEAD 2> /dev/null | tr -d '\r\n'"))
|
let l:cur_dir = fnamemodify(system("readlink -f " . a:filename), ":h")
|
||||||
|
let g:git_branch = trim(system("git -C " . l:cur_dir . " rev-parse --abbrev-ref HEAD 2> /dev/null | tr -d '\r\n'"))
|
||||||
return l:status
|
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function justmyrc#TabLine()
|
function justmyrc#TabLine()
|
||||||
|
|
10
vimrc
10
vimrc
|
@ -34,7 +34,7 @@ set statusline+=%#StatusLineEmpty#%=
|
||||||
set statusline+=%#StatusLineReadOnlyFlag#\ %r
|
set statusline+=%#StatusLineReadOnlyFlag#\ %r
|
||||||
set statusline+=%#StatusLineEncoding#\ %{&fileencoding?&fileencoding:&encoding}\
|
set statusline+=%#StatusLineEncoding#\ %{&fileencoding?&fileencoding:&encoding}\
|
||||||
set statusline+=%#StatusLineRuler#\ %v:%l\ (%p%%)\
|
set statusline+=%#StatusLineRuler#\ %v:%l\ (%p%%)\
|
||||||
set statusline+=%#StatusLineBranchName#\ %{justmyrc#GetBranchName()}\
|
set statusline+=%#StatusLineBranchName#\ %{g:git_branch}\
|
||||||
|
|
||||||
"Выключает перенос строк
|
"Выключает перенос строк
|
||||||
set nowrap
|
set nowrap
|
||||||
|
@ -69,10 +69,18 @@ set guioptions-=r
|
||||||
imap jk <ESC>
|
imap jk <ESC>
|
||||||
|
|
||||||
"Автонастройка для определенных типов файлов
|
"Автонастройка для определенных типов файлов
|
||||||
|
augroup GitBranch
|
||||||
|
autocmd!
|
||||||
|
autocmd BufEnter,ShellCmdPost,FileChangedShellPost * call justmyrc#GetBranchName(expand("%"))
|
||||||
|
autocmd BufLeave * let g:git_branch = ""
|
||||||
|
augroup END
|
||||||
|
|
||||||
|
augroup Python
|
||||||
autocmd BufEnter *.py set colorcolumn=80
|
autocmd BufEnter *.py set colorcolumn=80
|
||||||
autocmd BufLeave *.py set colorcolumn=0
|
autocmd BufLeave *.py set colorcolumn=0
|
||||||
|
|
||||||
autocmd BufEnter *.py compiler pycodestyle
|
autocmd BufEnter *.py compiler pycodestyle
|
||||||
|
augroup END
|
||||||
|
|
||||||
autocmd BufEnter *.md set wrap
|
autocmd BufEnter *.md set wrap
|
||||||
autocmd BufEnter *.md set colorcolumn=80
|
autocmd BufEnter *.md set colorcolumn=80
|
||||||
|
|
Loading…
Reference in a new issue