merge hide bookmarks and press ? options

This commit is contained in:
Cam Thompson 2011-02-27 20:36:06 -05:00
parent e88f436302
commit 999ba49857
2 changed files with 12 additions and 27 deletions

View File

@ -642,11 +642,8 @@ NERD tree. These options should be set in your vimrc.
|'NERDTreeWinSize'| Sets the window size when the NERD tree is
opened.
|'NERDTreeBmarksLabel'| Enables display of the Bookmarks label in
the NERD tree.
|'NERDTreePressHelp'| Enables display of the 'Press ? for help' at
the top of the NERD tree.
|'NERDTreeMinimalUI'| Disables display of the 'Bookmarks' label and
'Press ? for help' text.
------------------------------------------------------------------------------
3.2. Customisation details *NERDTreeOptionDetails*
@ -928,25 +925,14 @@ Default: 31.
This option is used to change the size of the NERD tree when it is loaded.
------------------------------------------------------------------------------
*'NERDTreeBmarksLabel'*
*'NERDTreeMinimalUI'*
Values: 0 or 1
Default: 1
Default: 0
This options enables the 'Bookmarks' label. Use one of the following lines
to set this option: >
let NERDTreeBmarksLabel=0
let NERDTreeBmarksLabel=1
<
------------------------------------------------------------------------------
*'NERDTreePressHelp'*
Values: 0 or 1
Default: 1
This options enables the 'Press ? for help' text. Use one of the following
lines to set this option: >
let NERDTreePressHelp=0
let NERDTreePressHelp=1
This options disables the 'Bookmarks' label 'Press ? for help' text. Use one
of the following lines to set this option: >
let NERDTreeMinimalUI=0
let NERDTreeMinimalUI=1
<
==============================================================================

View File

@ -51,8 +51,7 @@ call s:initVariable("g:NERDTreeAutoCenter", 1)
call s:initVariable("g:NERDTreeAutoCenterThreshold", 3)
call s:initVariable("g:NERDTreeCaseSensitiveSort", 0)
call s:initVariable("g:NERDTreeChDirMode", 0)
call s:initVariable("g:NERDTreePressHelp", 1)
call s:initVariable("g:NERDTreeBmarksLabel", 1)
call s:initVariable("g:NERDTreeMinimalUI", 0)
if !exists("g:NERDTreeIgnore")
let g:NERDTreeIgnore = ['\~$']
endif
@ -2999,7 +2998,7 @@ function! s:dumpHelp()
let @h=@h."\" :ClearBookmarks [<names>]\n"
let @h=@h."\" :ClearAllBookmarks\n"
silent! put h
elseif g:NERDTreePressHelp == 1
elseif g:NERDTreeMinimalUI == 0
let @h="\" Press ". g:NERDTreeMapHelp ." for help\n"
silent! put h
endif
@ -3242,7 +3241,7 @@ endfunction
"FUNCTION: s:renderBookmarks {{{2
function! s:renderBookmarks()
if g:NERDTreeBmarksLabel == 1
if g:NERDTreeMinimalUI == 0
call setline(line(".")+1, ">----------Bookmarks----------")
call cursor(line(".")+1, col("."))
endif
@ -3272,7 +3271,7 @@ function! s:renderView()
call s:dumpHelp()
"delete the blank line before the help and add one after it
if g:NERDTreePressHelp == 1
if g:NERDTreeMinimalUI == 0
call setline(line(".")+1, "")
call cursor(line(".")+1, col("."))
endif