From 5397c58abf90aca08b89e12279e7daba14ac82eb Mon Sep 17 00:00:00 2001
From: Jerome Reybert <jerome.reybert@kalray.eu>
Date: Sun, 18 Oct 2015 22:45:47 +0200
Subject: [PATCH] plugin/magit.vim: rename variable containing magit buffer
name
---
plugin/magit.vim | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/plugin/magit.vim b/plugin/magit.vim
index 6b5b32c..70acdad 100644
--- a/plugin/magit.vim
+++ b/plugin/magit.vim
@@ -15,8 +15,8 @@ let g:loaded_magit = 1
" syntax files
execute 'source ' . resolve(expand('<sfile>:p:h')) . '/../common/magit_common.vim'
-" g:magit_unstaged_buffer_name: vim buffer name for vimagit
-let g:magit_unstaged_buffer_name = "magit-playground"
+" g:magit_buffer_name: vim buffer name for vimagit
+let g:magit_buffer_name = "magit-playground"
let s:state = deepcopy(magit#state#state)
@@ -519,8 +519,8 @@ endfunction
" 4. fills with unstage stuff
" 5. restore window state
function! magit#update_buffer()
- if ( @% != g:magit_unstaged_buffer_name )
- echoerr "Not in magit buffer " . g:magit_unstaged_buffer_name . " but in " . @%
+ if ( @% != g:magit_buffer_name )
+ echoerr "Not in magit buffer " . g:magit_buffer_name . " but in " . @%
return
endif
" FIXME: find a way to save folding state. According to help, this won't
@@ -587,8 +587,8 @@ function! magit#show_magit(display)
setlocal filetype=magit
"setlocal readonly
- silent! execute "bdelete " . g:magit_unstaged_buffer_name
- execute "file " . g:magit_unstaged_buffer_name
+ silent! execute "bdelete " . g:magit_buffer_name
+ execute "file " . g:magit_buffer_name
execute "nnoremap <buffer> <silent> " . g:magit_stage_file_mapping . " :call magit#stage_file()<cr>"
execute "nnoremap <buffer> <silent> " . g:magit_stage_hunk_mapping . " :call magit#stage_hunk(0)<cr>"
--
GitLab