Skip to content

Commit

Permalink
Merge branch 'master' into next
Browse files Browse the repository at this point in the history
* master:
  plugin/magit.vim: suppress more 'line added' messages
  • Loading branch information
jreybert committed Dec 20, 2015
2 parents e856b6a + c5e02fb commit 6f86387
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions plugin/magit.vim
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ function! s:mg_display_files(mode, curdir, depth)
if ( file.depth != a:depth || filename !~ a:curdir . '.*' )
continue
endif
put =file.get_filename_header()
silent put =file.get_filename_header()

if ( file.dir != 0 )
if ( file.visible == 1 )
Expand All @@ -156,7 +156,7 @@ function! s:mg_display_files(mode, curdir, depth)
endif

if ( file.visible == 0 )
put =''
silent put =''
continue
endif
if ( file.exists == 0 )
Expand All @@ -171,7 +171,7 @@ function! s:mg_display_files(mode, curdir, depth)
silent put =hunk.lines
endif
endfor
put =''
silent put =''
endfor
endfunction

Expand All @@ -181,11 +181,11 @@ endfunction
" protected functions like magit#update_buffer
" param[in] mode: 'staged' or 'unstaged'
function! s:mg_get_staged_section(mode)
put =''
put =g:magit_sections[a:mode]
silent put =''
silent put =g:magit_sections[a:mode]
call <SID>mg_section_help(a:mode)
put =magit#utils#underline(g:magit_sections[a:mode])
put =''
silent put =magit#utils#underline(g:magit_sections[a:mode])
silent put =''
call s:mg_display_files(a:mode, '', 0)
endfunction

Expand All @@ -206,7 +206,7 @@ function! s:mg_get_stashes()

for stash in stash_list
let stash_id=substitute(stash, '^\(stash@{\d\+}\):.*$', '\1', '')
put =stash
silent put =stash
silent! execute "read !git stash show -p " . stash_id
endfor
endif
Expand Down Expand Up @@ -238,9 +238,9 @@ function! s:mg_get_commit_section()
if ( filereadable(git_dir . 'COMMIT_EDITMSG') )
let comment_char=<SID>mg_comment_char()
let commit_msg=magit#utils#join_list(filter(readfile(git_dir . 'COMMIT_EDITMSG'), 'v:val !~ "^' . comment_char . '"'))
put =commit_msg
silent put =commit_msg
endif
put =g:magit_sections.commit_end
silent put =g:magit_sections.commit_end
endif
endfunction

Expand Down

0 comments on commit 6f86387

Please sign in to comment.