Commits

Seh Hui Leong committed 66536c4

Updated and setup all VIM plugin into hg subrepo.

Comments (0)

Files changed (42)

+.vim/bundle/SrcExpl = [git]https://github.com/wesleyche/SrcExpl.git
 .vim/bundle/command-t = [git]git://git.wincent.com/command-t
+.vim/bundle/delimitMate = [git]https://github.com/Raimondi/delimitMate.git
+.vim/bundle/mustache.vim = [git]https://github.com/juvenn/mustache.vim.git
+.vim/bundle/nerdtree = [git]https://github.com/scrooloose/nerdtree.git
+.vim/bundle/pydoc.vim = [git]https://github.com/fs111/pydoc.vim.git
+.vim/bundle/snipmate.vim = [git]http://github.com/msanders/snipmate.vim.git
+.vim/bundle/sparkup = [git]https://github.com/rstacruz/sparkup.git
+.vim/bundle/vim-colors-solarized = [git]https://github.com/altercation/vim-colors-solarized.git
 .vim/bundle/vim-flake8 = [git]https://github.com/nvie/vim-flake8.git
+.vim/bundle/vim-fugitive = [git]https://github.com/tpope/vim-fugitive.git
+.vim/bundle/vim-markdown = [git]https://github.com/tpope/vim-markdown.git
+.vim/bundle/vim-surround = [git]https://github.com/tpope/vim-surround.git
+.vim/bundle/vim-taglist-plus = [git]https://github.com/int3/vim-taglist-plus.git
+.vim/bundle/vimoutliner = [git]https://github.com/vimoutliner/vimoutliner.git
+a8abf2f3cd6df97aab5ba5a119e9ff5e68e80477 .vim/bundle/SrcExpl
 07087e16ba8fe0a87b1d1ccd03e158a0157dc1f8 .vim/bundle/command-t
+0326b7c14a8acb7e4185df1f6033d87bab9ff152 .vim/bundle/delimitMate
+c3ee501a2dcabb8f145169b7a5df7ff74093104e .vim/bundle/mustache.vim
+1dc3891f960c25aa3f23aa46f5afc8d41db38233 .vim/bundle/nerdtree
+206b32508596e93c4bf6d5f5d446bb52bcdc5dd6 .vim/bundle/pydoc.vim
+f5a75d075d3c005ebe69e3f5e56cf99516e8aa3b .vim/bundle/snipmate.vim
+5041a10515c98f69dd510b0486983eee1fa1697e .vim/bundle/sparkup
+528a59f26d12278698bb946f8fb82a63711eec21 .vim/bundle/vim-colors-solarized
 d1bb8f1d440a4656342bcc536574e0e1627dedcb .vim/bundle/vim-flake8
+003f38c6a4d8e3d527e4e1dfeab6fdf05c8ff149 .vim/bundle/vim-fugitive
+9407dae6609ef9751acc8eedc30f52999018eb47 .vim/bundle/vim-markdown
+1a73f607f8f5477d6942df2eb6e7245c4864f4d3 .vim/bundle/vim-surround
+fc9f1c843733a0fd2dec29d49d5d83912c978914 .vim/bundle/vim-taglist-plus
+8d6fbc0845b62295632acec16b76cabe44309703 .vim/bundle/vimoutliner

.vim/bundle/bufexplorer/doc/bufexplorer.txt

-*bufexplorer.txt*              Buffer Explorer       Last Change: 16 Feb 2010
+*bufexplorer.txt*              Buffer Explorer       Last Change: 09 Oct 2012
 
 Buffer Explorer                                *buffer-explorer* *bufexplorer*
-                                Version 7.2.7
+                                Version 7.3.0
 
 Plugin for easily exploring (or browsing) Vim |:buffers|.
 
 USAGE                                                      *bufexplorer-usage*
 
 To start exploring in the current window, use: >
- \be   or   :BufExplorer
+ \be   or   :BufExplorer   or   Your custom key mapping
 To start exploring in a newly split horizontal window, use: >
- \bs   or   :BufExplorerHorizontalSplit
+ \bs   or   :BufExplorerHorizontalSplit   or   Your custom key mapping
 To start exploring in a newly split vertical window, use: >
- \bv   or   :BufExplorerVerticalSplit
+ \bv   or   :BufExplorerVerticalSplit   or   Your custom key mapping
 
 If you would like to use something other than '\', you may simply change the
 leader (see |mapleader|).
  <leftmouse>   Opens the buffer that is under the cursor into the current
                window.
  <shift-enter> Opens the buffer that is under the cursor in another tab.
+ B             Works in association with the|ShowTabBuffer|option.  If
+              |ShowTabBuffer|is set to 1, this toggles if BufExplorer is to
+               only store the most recent tab for this buffer or not.
  d            |:delete|the buffer under the cursor from the list.  The
                buffer's 'buflisted' is cleared. This allows for the buffer to
                be displayed again using the 'show unlisted' command.
- R             Toggles relative path/absolute path.
- T             Toggles to show only buffers for this tab or not.
  D            |:wipeout|the buffer under the cursor from the list.  When a
                buffers is wiped, it will not be shown when unlisted buffer are
                displayed.
  o             Opens the buffer that is under the cursor into the current
                window.
  p             Toggles the showing of a split filename/pathname.
- q             Quit exploring.
+ q             Exit/Close bufexplorer.
  r             Reverses the order the buffers are listed in.
- s             Selects the order the buffers are listed in. Either by buffer
+ R             Toggles relative path/absolute path.
+ s             Cycle thru how the buffers are listed. Either by buffer
                number, file name, file extension, most recently used (MRU), or
                full path.
+ S             Cycle thru how the buffers are listed, in reverse order.
+	       Either by buffer number, file name, file extension, most
+               recently used (MRU), or full path.
+ T             Toggles to show only buffers for this tab or not.
  t             Opens the buffer that is under the cursor in another tab.
  u             Toggles the showing of "unlisted" buffers.
 
 ===============================================================================
 CUSTOMIZATION                                       *bufexplorer-customization*
 
+If you do not like the default key mappings of \be, \bs, and \bv, you can
+override bufexplorer's default mappings by setting up something like the
+following in your vimrc file:
+
+  noremap <silent> <F11> :BufExplorer<CR>
+  noremap <silent> <m-F11> :BufExplorerHorizontalSplit<CR>
+  noremap <silent> <c-F11> :BufExplorerVerticalSplit<CR>
+
+                                                          *g:bufExplorerChgWin*
+If set, bufexplorer will bring up the selected buffer in the window specified
+by g:bufExplorerChgWin.
+
                                                      *g:bufExplorerDefaultHelp*
 To control whether the default help is displayed or not, use: >
   let g:bufExplorerDefaultHelp=0       " Do not show default help.
   let g:bufExplorerFindActive=1        " Go to active window.
 The default is to be taken to the active window.
 
+                                                         *g:bufExplorerFuncRef*
+When a buffer is selected, the functions specified either singly or as a list
+will be called.
+
                                                      *g:bufExplorerReverseSort*
 To control whether to sort the buffer in reverse order or not, use: >
   let g:bufExplorerReverseSort=0       " Do not sort in reverse order.
   let g:bufExplorerShowRelativePath=1  " Show relative paths.
 The default is to show absolute paths.
 
+                                                   *g:bufExplorerShowTabBuffer*
+To control weither or not to show buffers on for the specific tab or not, use: >
+  let g:bufExplorerShowTabBuffer=0        " No.
+  let g:bufExplorerShowTabBuffer=1        " Yes.
+The default is not to show.
+
                                                     *g:bufExplorerShowUnlisted*
 To control whether to show unlisted buffer or not, use: >
   let g:bufExplorerShowUnlisted=0      " Do not show unlisted buffers.
   let g:bufExplorerSplitRight=1        " Split right.
 The default is to use the global &splitright.
 
-                                                   *g:bufExplorerShowTabBuffer*
-To control weither or not to show buffers on for the specific tab or not, use: >
-  let g:bufExplorerShowTabBuffer=0        " No.
-  let g:bufExplorerShowTabBuffer=1        " Yes.
-The default is not to show.
-
 ===============================================================================
 CHANGE LOG                                              *bufexplorer-changelog*
 
+7.3.0  - It has been quite a while since I published a new version and this
+         is the first version since Vim 7.3 was released.
+         * Thanks to Tim Johnson for testing out this new version.
+         * I have put some time into reworking and cleaning up the code as
+         * well as various bug fixes.
+         * I have hopefully allowed for better mapping of the main public
+           methods as is explained in the|bufexplorer-customization|section
+           of the documentation.
+         * Add new 'B', 'o', and 'S' key mappings.
+         * Overall, I am hopeful that I not forgotten or lost a feature.
+7.2.8  - Enhancements:
+         * Thanks to Charles Campbell for integrating bufexplorer with GDBMGR.
+           http://mysite.verizon.net/astronaut/vim/index.html#GDBMGR
 7.2.7  - Fix:
          * My 1st attempt to fix the "cache" issue where buffers information
            has changed but the cache/display does not reflect those changes.

.vim/bundle/bufexplorer/plugin/bufexplorer.vim

-"==============================================================================
-"    Copyright: Copyright (C) 2001-2010 Jeff Lanzarotta
+"=============================================================================
+"    Copyright: Copyright (C) 2001-2012 Jeff Lanzarotta
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
 "               notice is copied with it. Like anything else that's free,
 " Name Of File: bufexplorer.vim
 "  Description: Buffer Explorer Vim Plugin
 "   Maintainer: Jeff Lanzarotta (delux256-vim at yahoo dot com)
-" Last Changed: Tuesday, 16 Feb 2010
+" Last Changed: Tuesday, 09 Oct 2012
 "      Version: See g:bufexplorer_version for version number.
 "        Usage: This file should reside in the plugin directory and be
 "               automatically sourced.
 "
 "               You may use the default keymappings of
 "
-"                 <Leader>be  - Opens BE.
-"                 <Leader>bs  - Opens horizontally window BE.
-"                 <Leader>bv  - Opens vertically window BE.
+"                 <Leader>be  - Opens BufExplorer
+"                 <Leader>bs  - Opens horizontally split window BufExplorer
+"                 <Leader>bv  - Opens vertically split window BufExplorer
+"
+"               Or you can override the defaults and define your own mapping
+"               in your vimrc file, for example:
+"
+"                   noremap <silent> <F11> :BufExplorer<CR>
+"                   noremap <silent> <m-F11> :BufExplorerHorizontalSplit<CR>
+"                   noremap <silent> <c-F11> :BufExplorerVerticalSplit<CR>
 "
 "               Or you can use
 "
-"                 ":BufExplorer"                - Opens BE.
-"                 ":BufExplorerHorizontalSplit" - Opens horizontally window BE.
-"                 ":BufExplorerVerticalSplit"   - Opens vertically window BE.
+"                 ":BufExplorer"                - Opens BufExplorer
+"                 ":BufExplorerHorizontalSplit" - Opens horizontally window BufExplorer
+"                 ":BufExplorerVerticalSplit"   - Opens vertically split window BufExplorer
 "
 "               For more help see supplied documentation.
 "      History: See supplied documentation.
-"==============================================================================
+"      Issues: 'D' and 'd' remove the buffer from the list but the list is not
+"              displayed correctly.
+"=============================================================================
 
-" Exit quickly if already running or when 'compatible' is set. {{{1
+" Plugin Code {{{1
+" Exit quickly if already running or when 'compatible' is set. {{{2
 if exists("g:bufexplorer_version") || &cp
-  finish
+    finish
 endif
-"1}}}
+"2}}}
 
 " Version number
-let g:bufexplorer_version = "7.2.7"
+let g:bufexplorer_version = "7.3.0"
 
-" Check for Vim version 700 or greater {{{1
+" Check for Vim version {{{2
 if v:version < 700
-  echo "Sorry, bufexplorer ".g:bufexplorer_version."\nONLY runs with Vim 7.0 and greater."
-  finish
+    echohl WarningMsg
+    echo "Sorry, bufexplorer ".g:bufexplorer_version." required Vim 7.0 and greater."
+    echohl None
+    finish
 endif
 
-" Public Interface {{{1
-if maparg("<Leader>be") =~ 'BufExplorer'
-  nunmap <Leader>be
-endif
-
-if maparg("<Leader>bs") =~ 'BufExplorerHorizontalSplit'
-  nunmap <Leader>bs
-endif
-
-if maparg("<Leader>bv") =~ 'BufExplorerVerticalSplit'
-  nunmap <Leader>bv
-endif
-
-nmap <script> <silent> <unique> <Leader>be :BufExplorer<CR>
-nmap <script> <silent> <unique> <Leader>bs :BufExplorerHorizontalSplit<CR>
-nmap <script> <silent> <unique> <Leader>bv :BufExplorerVerticalSplit<CR>
-
-" Create commands {{{1
-command! BufExplorer :call StartBufExplorer(has ("gui") ? "drop" : "hide edit")
+" Create commands {{{2
+command! BufExplorer :call BufExplorer(has ("gui") ? "drop" : "hide edit")
 command! BufExplorerHorizontalSplit :call BufExplorerHorizontalSplit()
 command! BufExplorerVerticalSplit :call BufExplorerVerticalSplit()
 
-" BESet {{{1
-function! s:BESet(var, default)
-  if !exists(a:var)
-    if type(a:default)
-      exec "let" a:var "=" string(a:default)
-    else
-      exec "let" a:var "=" a:default
+" Set {{{2
+function! s:Set(var, default)
+    if !exists(a:var)
+        if type(a:default)
+            exec "let" a:var "=" string(a:default)
+        else
+            exec "let" a:var "=" a:default
+        endif
+
+        return 1
     endif
 
-    return 1
-  endif
-
-  return 0
+    return 0
 endfunction
 
-" BEReset {{{1
-function! s:BEReset()
-  " Build initial MRUList. This makes sure all the files specified on the
-  " command line are picked up correctly.
-  let s:MRUList = range(1, bufnr('$'))
+" Script variables {{{2
+let s:MRU_Exclude_List = ["[BufExplorer]","__MRU_Files__"]
+let s:MRUList = []
+let s:name = '[BufExplorer]'
+let s:originBuffer = 0
+let s:running = 0
+let s:sort_by = ["number", "name", "fullpath", "mru", "extension"]
+let s:splitMode = ""
+let s:tabSpace = []
+let s:types = {"fullname": ':p', "path": ':p:h', "relativename": ':~:.', "relativepath": ':~:.:h', "shortname": ':t'}
 
-  " Initialize one tab space array, ignore zero-based tabpagenr
-  " since all tabpagenr's start at 1.
-  " -1 signifies this is the first time we are referencing this
-  " tabpagenr.
-  let s:tabSpace = [ [-1], [-1] ]
+" Setup the autocommands that handle the MRUList and other stuff. {{{2
+autocmd VimEnter * call s:Setup()
+
+" Setup {{{2
+function! s:Setup()
+    call s:Reset()
+
+    " Now that the MRUList is created, add the other autocmds.
+    augroup BufExplorer
+        autocmd!
+        autocmd BufEnter,BufNew * call s:ActivateBuffer()
+        autocmd BufWipeOut * call s:DeactivateBuffer(1)
+        autocmd BufDelete * call s:DeactivateBuffer(0)
+
+        autocmd BufWinEnter \[BufExplorer\] call s:Initialize()
+        autocmd BufWinLeave \[BufExplorer\] call s:Cleanup()
+
+        autocmd TabEnter * call s:TabEnter()
+
+        autocmd SessionLoadPost * call s:Reset()
+    augroup END
 endfunction
 
-" Setup the autocommands that handle the MRUList and other stuff. {{{1
-" This is only done once when Vim starts up.
-augroup BufExplorerVimEnter
-  autocmd!
-  autocmd VimEnter * call s:BESetup()
-augroup END
+" Reset {{{2
+function! s:Reset()
+    " Build initial MRUList. This makes sure all the files specified on the
+    " command line are picked up correctly.
+    let s:MRUList = range(1, bufnr('$'))
 
-" BESetup {{{1
-function! s:BESetup()
-  call s:BEReset()
+    " Initialize one tab space array, ignore zero-based tabpagenr
+    " since all tabpagenr's start at 1.
+    " -1 signifies this is the first time we are referencing this
+    " tabpagenr.
+    " If Vim has been loaded with mksession, then it is possible for
+    " more tabs to exist.  So use tabpagenr() to determine how large
+    " to make the array. If there are 4 tabs, there should be 5
+    " elements in this array.
+    " Each element will hold a CSV list of buffers viewed in
+    " that tab.  So on the 3rd tab, if there user has viewed
+    " 4 different buffers in that tab, the value would be:
+    "    echo s:tabSpace[3]
+    "    [4, 9, 1, 10]
+    "    echo s:tabSpace
+    "    [[-1], [-1], [-1], [4, 9, 1, 10], [-1]]
+    let s:tabSpace = []
+    let i = 0
 
-  " Now that the MRUList is created, add the other autocmds.
-  augroup BufExplorer
-    " Deleting autocommands in case the script is reloaded
-    autocmd!
-    autocmd TabEnter * call s:BETabEnter()
-    autocmd BufNew * call s:BEAddBuffer()
-    autocmd BufEnter * call s:BEActivateBuffer()
-
-    autocmd BufWipeOut * call s:BEDeactivateBuffer(1)
-    autocmd BufDelete * call s:BEDeactivateBuffer(0)
-
-    autocmd BufWinEnter \[BufExplorer\] call s:BEInitialize()
-    autocmd BufWinLeave \[BufExplorer\] call s:BECleanup()
-    autocmd SessionLoadPost * call s:BEReset()
-  augroup END
-
-  " Remove the VimEnter event as it is no longer needed
-  augroup SelectBufVimEnter
-    autocmd!
-  augroup END
+    while( tabpagenr('$') > 0 && i <= tabpagenr('$') )
+        call add(s:tabSpace, [-1])
+        let i = i + 1
+    endwhile
 endfunction
 
-" BETabEnter {{{1
-function! s:BETabEnter()
-  " Make s:tabSpace 1-based
-  if empty(s:tabSpace) || len(s:tabSpace) < (tabpagenr() + 1)
-    call add(s:tabSpace, [-1])
-  endif
+" ActivateBuffer {{{2
+function! s:ActivateBuffer()
+    " Verify the current tabpage exists in the
+    " current s:tabSpace array.  This can be missing
+    " entries when restoring sessions.
+    let i = 0
+    while( tabpagenr('$') > 0 && i <= tabpagenr() )
+        " Number:     0
+        " String:     1
+        " Funcref:    2
+        " List:       3
+        " Dictionary: 4
+        " Float:      5
+        if type(get(s:tabSpace, i)) == 0
+            call add(s:tabSpace, [-1])
+        endif
+
+        let i = i + 1
+    endwhile
+
+    let _bufnr = bufnr("%")
+    let list = get(s:tabSpace, tabpagenr(), [-1])
+
+    if !empty(list) && list[0] == '-1'
+        " The first time we add a tab, Vim uses the current buffer
+        " as it's starting page.  Even though we are about to
+        " edit a new page (BufEnter is triggered after), so
+        " remove the -1 entry indicating we have covered this case.
+        let list = []
+        call add(list, _bufnr)
+        let s:tabSpace[tabpagenr()] = list
+    elseif empty(list) || index(list, _bufnr) == -1
+        " Add new buffer to this tab's buffer list.
+        call add(list, _bufnr)
+        let s:tabSpace[tabpagenr()] = list
+
+        if g:bufExplorerOnlyOneTab == 1
+            " If a buffer can only be available in 1 tab page ensure this
+            " buffer is not present in any other tabs
+            let tabidx = 1
+            while tabidx < len(s:tabSpace)
+                if tabidx != tabpagenr()
+                    let bufidx = index(s:tabSpace[tabidx], _bufnr)
+                    if bufidx != -1
+                        call remove(s:tabSpace[tabidx], bufidx)
+                    endif
+                endif
+                let tabidx = tabidx + 1
+            endwhile
+        endif
+    endif
+
+    call s:MRUPush(_bufnr)
 endfunction
 
-" BEAddBuffer {{{1
-function! s:BEAddBuffer()
-  if !exists('s:raw_buffer_listing') || empty(s:raw_buffer_listing)
-    silent let s:raw_buffer_listing = s:BEGetBufferInfo(0)
-  else
-    " We cannot use :buffers! or :ls! to gather information 
-    " about this buffer since it was only just added.
-    " Any changes to the buffer (setlocal buftype, ...) 
-    " happens after this event fires.
-    "
-    " So we will indicate the :buffers! command must be re-run.
-    " This should help with the performance of the plugin.
-
-    " There are some checks which can be performed 
-    " before deciding to refresh the buffer list.
-    let bufnr = expand('<abuf>') + 0
-
-    if s:BEIgnoreBuffer(bufnr) == 1
-      return 
-    else
-      let s:refreshBufferList = 1
-    endif
-  endif
-
-  call s:BEActivateBuffer()
+" DeactivateBuffer {{{2
+function! s:DeactivateBuffer(remove)
+    let _bufnr = str2nr(expand("<abuf>"))
+    call s:MRUPop(_bufnr)
 endfunction
 
-" ActivateBuffer {{{1
-function! s:BEActivateBuffer()
-  let b = bufnr("%")
-  let l = get(s:tabSpace, tabpagenr(), [])
-
-  if s:BEIgnoreBuffer(b) == 1
-    return
-  endif
-
-  if !empty(l) && l[0] == '-1'
-    " The first time we add a tab Vim uses the current 
-    " buffer as it's starting page, even though we are about
-    " to edit a new page (BufEnter triggers after), so
-    " remove the -1 entry indicating we have covered this case.
-    let l = []
-    let s:tabSpace[tabpagenr()] = l
-  elseif empty(l) || index(l, b) == -1
-    " Add new buffer to this tab buffer list
-    let l = add(l, b)
-    let s:tabSpace[tabpagenr()] = l
-
-    if g:bufExplorerOnlyOneTab == 1
-      " If a buffer can only be available in 1 tab page
-      " ensure this buffer is not present in any other tabs
-      let tabidx = 1
-      while tabidx < len(s:tabSpace)
-        if tabidx != tabpagenr()
-          let bufidx = index(s:tabSpace[tabidx], b)
-          if bufidx != -1
-            call remove(s:tabSpace[tabidx], bufidx)
-          endif
-        endif
-        let tabidx = tabidx + 1
-      endwhile
+" TabEnter {{{2
+function! s:TabEnter()
+    " Make s:tabSpace 1-based
+    if empty(s:tabSpace) || len(s:tabSpace) < (tabpagenr() + 1)
+        call add(s:tabSpace, [-1])
     endif
-  endif
-
-  call s:BEMRUPush(b)
-
-  if exists('s:raw_buffer_listing') && !empty(s:raw_buffer_listing)
-    " Check if the buffer exists, but was deleted previously
-    " Careful use of ' and " so we do not have to escape all the \'s
-    " Regex: ^\s*bu\>
-    "        ^ - Starting at the beginning of the string
-    "        \s* - optional whitespace
-    "        b - Vim's buffer number
-    "        u\> - the buffer must be unlisted
-    let shortlist = filter(copy(s:raw_buffer_listing), "v:val.attributes =~ '".'^\s*'.b.'u\>'."'")
-
-    if !empty(shortlist)
-      " If it is unlisted (ie deleted), but now we editing it again 
-      " rebuild the buffer list.
-      let s:refreshBufferList = 1
-    endif
-  endif
 endfunction
 
-" BEDeactivateBuffer {{{1
-function! s:BEDeactivateBuffer(remove)
-  let _bufnr = str2nr(expand("<abuf>"))
-
-  call s:BEMRUPop(_bufnr)
-
-  if a:remove
-    call s:BEDeleteBufferListing(_bufnr)
-  else
-    let s:refreshBufferList = 1
-  endif
+" MRUPop {{{2
+function! s:MRUPop(bufnr)
+    call filter(s:MRUList, 'v:val != '.a:bufnr)
 endfunction
 
-" BEMRUPop {{{1
-function! s:BEMRUPop(buf)
-  call filter(s:MRUList, 'v:val != '.a:buf)
+" MRUPush {{{2
+function! s:MRUPush(buf)
+    " Skip temporary buffer with buftype set. Don't add the BufExplorer window to the
+    " list.
+    if s:ShouldIgnore(a:buf) == 1
+        return
+    endif
+
+    " Remove the buffer number from the list if it already exists.
+    call s:MRUPop(a:buf)
+
+    " Add the buffer number to the head of the list.
+    call insert(s:MRUList, a:buf)
 endfunction
 
-" BEMRUPush {{{1
-function! s:BEMRUPush(buf)
-  if s:BEIgnoreBuffer(a:buf) == 1
-    return
-  endif
+" ShouldIgnore {{{2
+function! s:ShouldIgnore(buf)
+    " Ignore temporary buffers with buftype set.
+    if empty(getbufvar(a:buf, "&buftype") == 0)
+        return 1
+    endif
 
-  " Remove the buffer number from the list if it already exists.
-  call s:BEMRUPop(a:buf)
+    " Ignore unlisted buffers.
+    if buflisted(a:buf) == 0
+        return 1
+    endif
 
-  " Add the buffer number to the head of the list.
-  call insert(s:MRUList,a:buf)
+    " Ignore buffers with no name.
+    if empty(bufname(a:buf)) == 1
+        return 1
+    endif
+
+    " Ignore the BufExplorer buffer.
+    if fnamemodify(bufname(a:buf), ":t") == s:name
+        return 1
+    endif
+
+    " Ignore any buffers in the exclude list.
+    if index(s:MRU_Exclude_List, bufname(a:buf)) >= 0
+        return 1
+    endif
+
+    " Else return 0 to indicate that the buffer was not ignored.
+    return 0
 endfunction
 
-" BEInitialize {{{1
-function! s:BEInitialize()
-  let s:_insertmode = &insertmode
-  set noinsertmode
+" Initialize {{{2
+function! s:Initialize()
+    let s:_insertmode = &insertmode
+    set noinsertmode
 
-  let s:_showcmd = &showcmd
-  set noshowcmd
+    let s:_showcmd = &showcmd
+    set noshowcmd
 
-  let s:_cpo = &cpo
-  set cpo&vim
+    let s:_cpo = &cpo
+    set cpo&vim
 
-  let s:_report = &report
-  let &report = 10000
+    let s:_report = &report
+    let &report = 10000
 
-  let s:_list = &list
-  set nolist
+    let s:_list = &list
+    set nolist
 
-  setlocal nonumber
-  setlocal foldcolumn=0
-  setlocal nofoldenable
-  setlocal cursorline
-  setlocal nospell
-  setlocal nobuflisted
+    setlocal nonumber
+    setlocal foldcolumn=0
+    setlocal nofoldenable
+    setlocal cursorline
+    setlocal nospell
 
-  let s:running = 1
+    setlocal nobuflisted
+
+    let s:running = 1
 endfunction
 
-" BEIgnoreBuffer 
-function! s:BEIgnoreBuffer(buf)
-  " Check to see if this buffer should be ignore by BufExplorer.
+" Cleanup {{{2
+function! s:Cleanup()
+    if exists("s:_insertmode")
+        let &insertmode = s:_insertmode
+    endif
 
-  " Skip temporary buffers with buftype set.
-  if empty(getbufvar(a:buf, "&buftype") == 0)
-    return 1
-  endif
+    if exists("s:_showcmd")
+        let &showcmd = s:_showcmd
+    endif
 
-  " Skip unlisted buffers.
-  if buflisted(a:buf) == 0
-    return 1
-  endif
+    if exists("s:_cpo")
+        let &cpo = s:_cpo
+    endif
 
-  " Skip buffers with no name.
-  if empty(bufname(a:buf)) == 1
-    return 1
-  endif
+    if exists("s:_report")
+        let &report = s:_report
+    endif
 
-  " Do not add the BufExplorer window to the list.
-  if fnamemodify(bufname(a:buf), ":t") == s:name
-    return 1
-  endif
+    if exists("s:_list")
+        let &list = s:_list
+    endif
 
-  if index(s:MRU_Exclude_List, bufname(a:buf)) >= 0
-    return 1
-  end
+    let s:running = 0
+    let s:splitMode = ""
 
-  return 0 
+    delmarks!
 endfunction
 
-" BECleanup {{{1
-function! s:BECleanup()
-  let &insertmode = s:_insertmode
-  let &showcmd = s:_showcmd
-  let &cpo = s:_cpo
-  let &report = s:_report
-  let &list = s:_list
-  let s:running = 0
-  let s:splitMode = ""
-
-  delmarks!
+" BufExplorerHorizontalSplit {{{2
+function! BufExplorerHorizontalSplit()
+    let s:splitMode = "sp"
+    exec "BufExplorer"
 endfunction
 
-" BufExplorerHorizontalSplit {{{1
-function! BufExplorerHorizontalSplit()
-  let s:splitMode = "sp"
-  exec "BufExplorer"
+" BufExplorerVerticalSplit {{{2
+function! BufExplorerVerticalSplit()
+    let s:splitMode = "vsp"
+    exec "BufExplorer"
 endfunction
 
-" BufExplorerVerticalSplit {{{1
-function! BufExplorerVerticalSplit()
-  let s:splitMode = "vsp"
-  exec "BufExplorer"
+" BufExplorer {{{2
+function! BufExplorer(open)
+    let name = s:name
+
+    if !has("win32")
+        " On non-Windows boxes, escape the name so that is shows up correctly.
+        let name = escape(name, "[]")
+    endif
+
+    " Make sure there is only one explorer open at a time.
+    if s:running == 1
+        " Go to the open buffer.
+        if has("gui")
+            exec "drop" name
+        endif
+
+        return
+    endif
+
+    " Add zero to ensure the variable is treated as a number.
+    let s:originBuffer = bufnr("%") + 0
+
+    silent let s:raw_buffer_listing = s:GetBufferInfo(0)
+
+    let buffer_listing_copy = copy(s:raw_buffer_listing)
+
+    if (g:bufExplorerShowUnlisted == 0)
+        call filter(buffer_listing_copy, 'v:val.attributes !~ "u"')
+    endif
+
+    if (!empty(buffer_listing_copy))
+        call filter(buffer_listing_copy, 'v:val.shortname !~ "\\\[No Name\\\]"')
+    endif
+
+"   if len(buffer_listing_copy) <= 1
+"       call s:Warning("Sorry, there are no more buffers to explore")
+"       return
+"   endif
+
+    " We may have to split the current window.
+    if (s:splitMode != "")
+        " Save off the original settings.
+        let [_splitbelow, _splitright] = [&splitbelow, &splitright]
+
+        " Set the setting to ours.
+        let [&splitbelow, &splitright] = [g:bufExplorerSplitBelow, g:bufExplorerSplitRight]
+
+        " Do it.
+        exe 'keepalt '.s:splitMode
+
+        " Restore the original settings.
+        let [&splitbelow, &splitright] = [_splitbelow, _splitright]
+    endif
+
+    if !exists("b:displayMode") || b:displayMode != "winmanager"
+        " Do not use keepalt when opening bufexplorer to allow the buffer that
+        " we are leaving to become the new alternate buffer
+        exec "silent keepjumps ".a:open." ".name
+    endif
+
+    call s:DisplayBufferList()
 endfunction
 
-" StartBufExplorer {{{1
-function! StartBufExplorer(open)
-  let name = s:name
+" DisplayBufferList {{{2
+function! s:DisplayBufferList()
+    " Do not set bufhidden since it wipes out the data if we switch away from
+    " the buffer using CTRL-^.
+    setlocal buftype=nofile
+    setlocal modifiable
+    setlocal noswapfile
+    setlocal nowrap
 
-  if !has("win32")
-    " On non-Windows boxes, escape the name so that is shows up correctly.
-    let name = escape(name, "[]")
-  endif
+    call s:SetupSyntax()
+    call s:MapKeys()
+    call setline(1, s:CreateHelp())
+    call s:BuildBufferList()
+    call cursor(s:firstBufferLine, 1)
 
-  " Make sure there is only one explorer open at a time.
-  if s:running == 1
-    " Go to the open buffer.
-    if has("gui")
-      exec "drop" name
+    if !g:bufExplorerResize
+        normal! zz
     endif
 
-    return
-  endif
-
-  " Add zero to ensure the variable is treated as a Number.
-  let s:originBuffer = bufnr("%") + 0
-
-  " Create or rebuild the raw buffer list if necessary.
-  if !exists('s:raw_buffer_listing') || 
-        \ empty(s:raw_buffer_listing) ||
-        \ s:refreshBufferList == 1
-    silent let s:raw_buffer_listing = s:BEGetBufferInfo(0)
-  endif
-
-  let copy = copy(s:raw_buffer_listing)
-
-  if (g:bufExplorerShowUnlisted == 0)
-    call filter(copy, 'v:val.attributes !~ "u"')
-  endif
-
-  " We may have to split the current window.
-  if (s:splitMode != "")
-    " Save off the original settings.
-    let [_splitbelow, _splitright] = [&splitbelow, &splitright]
-
-    " Set the setting to ours.
-    let [&splitbelow, &splitright] = [g:bufExplorerSplitBelow, g:bufExplorerSplitRight]
-
-    " Do it.
-    exe 'keepalt '.s:splitMode
-
-    " Restore the original settings.
-    let [&splitbelow, &splitright] = [_splitbelow, _splitright]
-  endif
-
-  if !exists("b:displayMode") || b:displayMode != "winmanager"
-    " Do not use keepalt when opening bufexplorer to allow the buffer that we are
-    " leaving to become the new alternate buffer
-    exec "silent keepjumps ".a:open." ".name
-  endif
-
-  call s:BEDisplayBufferList()
+    setlocal nomodifiable
 endfunction
 
-" BEDisplayBufferList {{{1
-function! s:BEDisplayBufferList()
-  " Do not set bufhidden since it wipes out 
-  " the data if we switch away from the buffer 
-  " using CTRL-^
-  setlocal buftype=nofile
-  setlocal modifiable
-  setlocal noswapfile
-  setlocal nowrap
+" MapKeys {{{2
+function! s:MapKeys()
+    if exists("b:displayMode") && b:displayMode == "winmanager"
+        nnoremap <buffer> <silent> <tab> :call <SID>SelectBuffer()<CR>
+    endif
 
-  " Delete all previous lines to the black hole register
-  call cursor(1,1)
-  exec 'silent! normal! "_dG'
+    nnoremap <script> <silent> <buffer> <2-leftmouse> :call <SID>SelectBuffer()<CR>
+    nnoremap <script> <silent> <buffer> <CR>          :call <SID>SelectBuffer()<CR>
+    nnoremap <script> <silent> <buffer> <F1>          :call <SID>ToggleHelp()<CR>
+    nnoremap <script> <silent> <buffer> <s-cr>        :call <SID>SelectBuffer("tab")<CR>
+    nnoremap <script> <silent> <buffer> B             :call <SID>ToggleOnlyOneTab()<CR>
+    nnoremap <script> <silent> <buffer> d             :call <SID>RemoveBuffer("delete")<CR>
+    nnoremap <script> <silent> <buffer> D             :call <SID>RemoveBuffer("wipe")<CR>
+    nnoremap <script> <silent> <buffer> f             :call <SID>ToggleFindActive()<CR>
+    nnoremap <script> <silent> <buffer> m             :call <SID>MRUListShow()<CR>
+    nnoremap <script> <silent> <buffer> o             :call <SID>SelectBuffer()<CR>
+    nnoremap <script> <silent> <buffer> p             :call <SID>ToggleSplitOutPathName()<CR>
+    nnoremap <script> <silent> <buffer> q             :call <SID>Close()<CR>
+    nnoremap <script> <silent> <buffer> r             :call <SID>SortReverse()<CR>
+    nnoremap <script> <silent> <buffer> R             :call <SID>ToggleShowRelativePath()<CR>
+    nnoremap <script> <silent> <buffer> s             :call <SID>SortSelect()<CR>
+    nnoremap <script> <silent> <buffer> S             :call <SID>ReverseSortSelect()<CR>
+    nnoremap <script> <silent> <buffer> t             :call <SID>SelectBuffer("tab")<CR>
+    nnoremap <script> <silent> <buffer> T             :call <SID>ToggleShowTabBuffer()<CR>
+    nnoremap <script> <silent> <buffer> u             :call <SID>ToggleShowUnlisted()<CR>
 
-  call s:BESetupSyntax()
-  call s:BEMapKeys()
-  call setline(1, s:BECreateHelp())
-  call s:BEBuildBufferList()
-  call cursor(s:firstBufferLine, 1)
-
-  if !g:bufExplorerResize
-    normal! zz
-  endif
-
-  setlocal nomodifiable
+    for k in ["G", "n", "N", "L", "M", "H"]
+        exec "nnoremap <buffer> <silent>" k ":keepjumps normal!" k."<CR>"
+    endfor
 endfunction
 
-" BEMapKeys {{{1
-function! s:BEMapKeys()
-  if exists("b:displayMode") && b:displayMode == "winmanager"
-    nnoremap <buffer> <silent> <tab> :call <SID>BESelectBuffer("tab")<cr>
-  endif
+" SetupSyntax {{{2
+function! s:SetupSyntax()
+    if has("syntax")
+        syn match bufExplorerHelp     "^\".*" contains=bufExplorerSortBy,bufExplorerMapping,bufExplorerTitle,bufExplorerSortType,bufExplorerToggleSplit,bufExplorerToggleOpen
+        syn match bufExplorerOpenIn   "Open in \w\+ window" contained
+        syn match bufExplorerSplit    "\w\+ split" contained
+        syn match bufExplorerSortBy   "Sorted by .*" contained contains=bufExplorerOpenIn,bufExplorerSplit
+        syn match bufExplorerMapping  "\" \zs.\+\ze :" contained
+        syn match bufExplorerTitle    "Buffer Explorer.*" contained
+        syn match bufExplorerSortType "'\w\{-}'" contained
+        syn match bufExplorerBufNbr   /^\s*\d\+/
+        syn match bufExplorerToggleSplit  "toggle split type" contained
+        syn match bufExplorerToggleOpen   "toggle open mode" contained
 
-  nnoremap <buffer> <silent> <F1>          :call <SID>BEToggleHelp()<cr>
-  nnoremap <buffer> <silent> <2-leftmouse> :call <SID>BESelectBuffer()<cr>
-  nnoremap <buffer> <silent> <cr>          :call <SID>BESelectBuffer()<cr>
-  nnoremap <buffer> <silent> o             :call <SID>BESelectBuffer()<cr>
-  nnoremap <buffer> <silent> t             :call <SID>BESelectBuffer("tab")<cr>
-  nnoremap <buffer> <silent> <s-cr>        :call <SID>BESelectBuffer("tab")<cr>
+        syn match bufExplorerModBuf    /^\s*\d\+.\{4}+.*/
+        syn match bufExplorerLockedBuf /^\s*\d\+.\{3}[\-=].*/
+        syn match bufExplorerHidBuf    /^\s*\d\+.\{2}h.*/
+        syn match bufExplorerActBuf    /^\s*\d\+.\{2}a.*/
+        syn match bufExplorerCurBuf    /^\s*\d\+.%.*/
+        syn match bufExplorerAltBuf    /^\s*\d\+.#.*/
+        syn match bufExplorerUnlBuf    /^\s*\d\+u.*/
 
-  nnoremap <buffer> <silent> d             :call <SID>BERemoveBuffer("delete", "n")<cr>
-  xnoremap <buffer> <silent> d             :call <SID>BERemoveBuffer("delete", "v")<cr>
-  nnoremap <buffer> <silent> D             :call <SID>BERemoveBuffer("wipe", "n")<cr>
-  xnoremap <buffer> <silent> D             :call <SID>BERemoveBuffer("wipe", "v")<cr>
+        hi def link bufExplorerBufNbr Number
+        hi def link bufExplorerMapping NonText
+        hi def link bufExplorerHelp Special
+        hi def link bufExplorerOpenIn Identifier
+        hi def link bufExplorerSortBy String
+        hi def link bufExplorerSplit NonText
+        hi def link bufExplorerTitle NonText
+        hi def link bufExplorerSortType bufExplorerSortBy
+        hi def link bufExplorerToggleSplit bufExplorerSplit
+        hi def link bufExplorerToggleOpen bufExplorerOpenIn
 
-  nnoremap <buffer> <silent> m             :call <SID>BEMRUListShow()<cr>
-  nnoremap <buffer> <silent> p             :call <SID>BEToggleSplitOutPathName()<cr>
-  nnoremap <buffer> <silent> q             :call <SID>BEClose("quit")<cr>
-  nnoremap <buffer> <silent> r             :call <SID>BESortReverse()<cr>
-  nnoremap <buffer> <silent> R             :call <SID>BEToggleShowRelativePath()<cr>
-  nnoremap <buffer> <silent> s             :call <SID>BESortSelect()<cr>
-  nnoremap <buffer> <silent> S             :call <SID>BEReverseSortSelect()<cr>
-  nnoremap <buffer> <silent> u             :call <SID>BEToggleShowUnlisted()<cr>
-  nnoremap <buffer> <silent> f             :call <SID>BEToggleFindActive()<cr>
-  nnoremap <buffer> <silent> T             :call <SID>BEToggleShowTabBuffer()<cr>
-  nnoremap <buffer> <silent> B             :call <SID>BEToggleOnlyOneTab()<cr>
-
-  for k in ["G", "n", "N", "L", "M", "H"]
-    exec "nnoremap <buffer> <silent>" k ":keepjumps normal!" k."<cr>"
-  endfor
+        hi def link bufExplorerActBuf Identifier
+        hi def link bufExplorerAltBuf String
+        hi def link bufExplorerCurBuf Type
+        hi def link bufExplorerHidBuf Constant
+        hi def link bufExplorerLockedBuf Special
+        hi def link bufExplorerModBuf Exception
+        hi def link bufExplorerUnlBuf Comment
+    endif
 endfunction
 
-" BESetupSyntax {{{1
-function! s:BESetupSyntax()
-  if has("syntax")
-    syn match bufExplorerHelp         "^\".*" contains=bufExplorerSortBy,bufExplorerMapping,bufExplorerTitle,bufExplorerSortType,bufExplorerToggleSplit,bufExplorerToggleOpen
-    syn match bufExplorerOpenIn       "Open in \w\+ window" contained
-    syn match bufExplorerSplit        "\w\+ split" contained
-    syn match bufExplorerSortBy       "Sorted by .*" contained contains=bufExplorerOpenIn,bufExplorerSplit
-    syn match bufExplorerMapping      "\" \zs.\+\ze :" contained
-    syn match bufExplorerTitle        "Buffer Explorer.*" contained
-    syn match bufExplorerSortType     "'\w\{-}'" contained
-    syn match bufExplorerBufNbr       /^\s*\d\+/
-    syn match bufExplorerToggleSplit  "toggle split type" contained
-    syn match bufExplorerToggleOpen   "toggle open mode" contained
-    syn match bufExplorerModBuf       /^\s*\d\+.\{4}+.*/
-    syn match bufExplorerLockedBuf    /^\s*\d\+.\{3}[\-=].*/
-    syn match bufExplorerHidBuf       /^\s*\d\+.\{2}h.*/
-    syn match bufExplorerActBuf       /^\s*\d\+.\{2}a.*/
-    syn match bufExplorerCurBuf       /^\s*\d\+.%.*/
-    syn match bufExplorerAltBuf       /^\s*\d\+.#.*/
-    syn match bufExplorerUnlBuf       /^\s*\d\+u.*/
-
-    hi def link bufExplorerBufNbr Number
-    hi def link bufExplorerMapping NonText
-    hi def link bufExplorerHelp Special
-    hi def link bufExplorerOpenIn Identifier
-    hi def link bufExplorerSortBy String
-    hi def link bufExplorerSplit NonText
-    hi def link bufExplorerTitle NonText
-    hi def link bufExplorerSortType bufExplorerSortBy
-    hi def link bufExplorerToggleSplit bufExplorerSplit
-    hi def link bufExplorerToggleOpen bufExplorerOpenIn
-
-    hi def link bufExplorerActBuf Identifier
-    hi def link bufExplorerAltBuf String
-    hi def link bufExplorerCurBuf Type
-    hi def link bufExplorerHidBuf Constant
-    hi def link bufExplorerLockedBuf Special
-    hi def link bufExplorerModBuf Exception
-    hi def link bufExplorerUnlBuf Comment
-  endif
-endfunction
-
-" BEToggleHelp {{{1
-function! s:BEToggleHelp()
-  let g:bufExplorerDetailedHelp = !g:bufExplorerDetailedHelp
-
-  setlocal modifiable
-
-  " Save position.
-  normal! ma
-
-  " Remove old header.
-  if (s:firstBufferLine > 1)
-    exec "keepjumps 1,".(s:firstBufferLine - 1) "d _"
-  endif
-
-  call append(0, s:BECreateHelp())
-
-  silent! normal! g`a
-  delmarks a
-
-  setlocal nomodifiable
-
-  if exists("b:displayMode") && b:displayMode == "winmanager"
-    call WinManagerForceReSize("BufExplorer")
-  endif
-endfunction
-
-" BEGetHelpStatus {{{1
-function! s:BEGetHelpStatus()
-  let ret = '" Sorted by '.((g:bufExplorerReverseSort == 1) ? "reverse " : "").g:bufExplorerSortBy
-  let ret .= ' | '.((g:bufExplorerFindActive == 0) ? "Don't " : "")."Locate buffer"
-  let ret .= ((g:bufExplorerShowUnlisted == 0) ? "" : " | Show unlisted")
-  let ret .= ((g:bufExplorerShowTabBuffer == 0) ? "" : " | Show buffers/tab")
-  let ret .= ((g:bufExplorerOnlyOneTab == 1) ? "" : " | One tab / buffer")
-  let ret .= ' | '.((g:bufExplorerShowRelativePath == 0) ? "Absolute" : "Relative")
-  let ret .= ' '.((g:bufExplorerSplitOutPathName == 0) ? "Full" : "Split")." path"
-
-  return ret
-endfunction
-
-" BECreateHelp {{{1
-function! s:BECreateHelp()
-  if g:bufExplorerDefaultHelp == 0 && g:bufExplorerDetailedHelp == 0
-    let s:firstBufferLine = 1
-    return []
-  endif
-
-  let header = []
-
-  if g:bufExplorerDetailedHelp == 1
-    call add(header, '" Buffer Explorer ('.g:bufexplorer_version.')')
-    call add(header, '" --------------------------')
-    call add(header, '" <F1> : toggle this help')
-    call add(header, '" <enter> or o or Mouse-Double-Click : open buffer under cursor')
-    call add(header, '" <shift-enter> or t : open buffer in another tab')
-    call add(header, '" d : delete buffer')
-    call add(header, '" D : wipe buffer')
-    call add(header, '" f : toggle find active buffer')
-    call add(header, '" p : toggle spliting of file and path name')
-    call add(header, '" q : quit')
-    call add(header, '" r : reverse sort')
-    call add(header, '" R : toggle showing relative or full paths')
-    call add(header, '" s : cycle thru "sort by" fields '.string(s:sort_by).'')
-    call add(header, '" S : reverse cycle thru "sort by" fields')
-    call add(header, '" T : toggle if to show only buffers for this tab or not')
-    call add(header, '" u : toggle showing unlisted buffers')
-  else
-    call add(header, '" Press <F1> for Help')
-  endif
-
-  if (!exists("b:displayMode") || b:displayMode != "winmanager") || (b:displayMode == "winmanager" && g:bufExplorerDetailedHelp == 1)
-    call add(header, s:BEGetHelpStatus())
-    call add(header, '"=')
-  endif
-
-  let s:firstBufferLine = len(header) + 1
-
-  return header
-endfunction
-
-" BEGetBufferInfo {{{1
-function! s:BEGetBufferInfo(bufnr)
-  redir => bufoutput
-  buffers!
-  redir END
-
-  if (a:bufnr > 0)
-    " Since we are only interested in this specified buffer 
-    " remove the other buffers listed
-    let bufoutput = substitute(bufoutput."\n", '^.*\n\(\s*'.a:bufnr.'\>.\{-}\)\n.*', '\1', '')
-  endif
-
-  let [all, allwidths, listedwidths] = [[], {}, {}]
-
-  for n in keys(s:types)
-    let allwidths[n] = []
-    let listedwidths[n] = []
-  endfor
-
-  for buf in split(bufoutput, '\n')
-    let bits = split(buf, '"')
-    let b = {"attributes": bits[0], "line": substitute(bits[2], '\s*', '', '')}
-
-    for [key, val] in items(s:types)
-      let b[key] = fnamemodify(bits[1], val)
-    endfor
-
-    if getftype(b.fullname) == "dir" && g:bufExplorerShowDirectories == 1
-      let b.shortname = "<DIRECTORY>"
-    endif
-
-    call add(all, b)
-
-    for n in keys(s:types)
-      call add(allwidths[n], len(b[n]))
-
-      if b.attributes !~ "u"
-        call add(listedwidths[n], len(b[n]))
-      endif
-    endfor
-  endfor
-
-  let [s:allpads, s:listedpads] = [{}, {}]
-
-  for n in keys(s:types)
-    let s:allpads[n] = repeat(' ', max(allwidths[n]))
-    let s:listedpads[n] = repeat(' ', max(listedwidths[n]))
-  endfor
-
-  let s:refreshBufferList = 1
-
-  return all
-endfunction
-
-" BEBuildBufferList {{{1
-function! s:BEBuildBufferList()
-  let lines = []
-
-  " Loop through every buffer.
-  for buf in s:raw_buffer_listing
-    if (!g:bufExplorerShowUnlisted && buf.attributes =~ "u")
-      " Skip unlisted buffers if we are not to show them.
-      continue
-    endif
-
-    if (g:bufExplorerShowTabBuffer)
-      let show_buffer = 0
-
-      for bufnr in s:tabSpace[tabpagenr()]
-        if (buf.attributes =~ '^\s*'.bufnr.'\>')
-          " Only buffers shown on the current tabpagenr
-          let show_buffer = 1
-          break
-        endif
-      endfor
-
-      if show_buffer == 0 
-        continue
-      endif
-    endif
-
-    let line = buf.attributes." "
-
-    if g:bufExplorerSplitOutPathName
-      let type = (g:bufExplorerShowRelativePath) ? "relativepath" : "path"
-      let path = buf[type]
-      let pad  = (g:bufExplorerShowUnlisted) ? s:allpads.shortname : s:listedpads.shortname
-      let line .= buf.shortname." ".strpart(pad.path, len(buf.shortname))
-    else
-      let type = (g:bufExplorerShowRelativePath) ? "relativename" : "fullname"
-      let path = buf[type]
-      let line .= path
-    endif
-
-    let pads = (g:bufExplorerShowUnlisted) ? s:allpads : s:listedpads
-
-    if !empty(pads[type])
-      let line .= strpart(pads[type], len(path))." "
-    endif
-
-    let line .= buf.line
-
-    call add(lines, line)
-  endfor
-
-  call setline(s:firstBufferLine, lines)
-
-  call s:BESortListing()
-endfunction
-
-" BESelectBuffer {{{1
-function! s:BESelectBuffer(...)
-  " Sometimes messages are not cleared when we get here so it looks like an error has
-  " occurred when it really has not.
-  echo ""
-
-  " Are we on a line with a file name?
-  if line('.') < s:firstBufferLine
-    exec "normal! \<cr>"
-    return
-  endif
-
-  let _bufNbr = str2nr(getline('.'))
-
-  " Check and see if we are running BE via WinManager.
-  if exists("b:displayMode") && b:displayMode == "winmanager"
-    let bufname = expand("#"._bufNbr.":p")
-
-    if (a:0 == 1) && (a:1 == "tab")
-      call WinManagerFileEdit(bufname, 1)
-    else
-      call WinManagerFileEdit(bufname, 0)
-    endif
- 
-    return
-  endif
-
-  if bufexists(_bufNbr)
-    if bufnr("#") == _bufNbr
-      return s:BEClose("")
-    endif
-
-    " Are we suppose to open the selected buffer in a tab?
-    if (a:0 == 1) && (a:1 == "tab")
-      " Yes, we are to open the selected buffer in a tab.
-
-      " Restore [BufExplorer] buffer.
-      exec "keepjumps silent buffer!".s:originBuffer
-
-      " Get the tab number where this buffer is located at.
-      let tabNbr = s:BEGetTabNbr(_bufNbr)
-
-      " Was the tab found?
-      if tabNbr == 0
-        " _bufNbr is not opened in any tabs. Open a new tab with the selected buffer in it.
-        exec "999tab split +buffer" . _bufNbr
-      else
-        " The _bufNbr is already opened in tab, go to that tab.
-        exec tabNbr . "tabnext"
-
-        " Focus window.
-        exec s:BEGetWinNbr(tabNbr, _bufNbr) . "wincmd w"
-      endif
-    else
-      "No, the use did not ask to open the selected buffer in a tab.
-
-      " Are we suppose to move to the tab where this active buffer is?
-      if bufloaded(_bufNbr) && g:bufExplorerFindActive
-        " Close the BE window.
-        call s:BEClose("")
-
-        " Get the tab number where this buffer is located at.
-        let tabNbr = s:BEGetTabNbr(_bufNbr)
-
-        " Was the tab found?
-        if tabNbr != 0
-          " The buffer is located in a tab. Go to that tab number.
-          exec tabNbr . "tabnext"
-        else
-          " Nope, the buffer is not in a tab, simple switch to that buffer.
-          let bufname = expand("#"._bufNbr.":p")
-          exec bufname ? "drop ".escape(bufname, " ") : "buffer "._bufNbr
-        endif
-      endif
-
-      " Switch to the buffer.
-      exec "keepalt keepjumps silent b!" _bufNbr
-    endif
-
-    " Make the buffer 'listed' again.
-    call setbufvar(_bufNbr, "&buflisted", "1")
-  else
-    call s:BEError("Sorry, that buffer no longer exists, please select another")
-    call s:BEDeleteBuffer(_bufNbr, "wipe")
-  endif
-endfunction
-
-" BEDeleteBufferListing {{{1
-function! s:BEDeleteBufferListing(buf)
-  if exists('s:raw_buffer_listing') && !empty(s:raw_buffer_listing)
-    " Delete the buffer from the raw buffer list.
-    " Careful use of ' and " so we do not have to escape all the \'s
-    " Regex: ^\s*\(10\|20\)\>
-    "        ^ - Starting at the beginning of the string
-    "        \s* - optional whitespace
-    "        \(10\|20\) - either a 10 or a 20
-    "        \> - end of word (so it can't make 100 or 201)
-    call filter(s:raw_buffer_listing, "v:val.attributes !~ '".'^\s*\('.substitute(a:buf, ' ', '\\|', 'g').'\)\>'."'")
-  endif
-endfunction
-
-" BERemoveBuffer {{{1
-function! s:BERemoveBuffer(type, mode) range
-  " Are we on a line with a file name?
-  if line('.') < s:firstBufferLine
-    return
-  endif
-
-  " These commands are to temporarily suspend the activity of winmanager.
-  if exists("b:displayMode") && b:displayMode == "winmanager"
-    call WinManagerSuspendAUs()
-  endif
-
-  let _bufNbrs = ''
-
-  for lineNum in range(a:firstline, a:lastline)
-    let line = getline(lineNum)
-
-    if line =~ '^\s*\(\d\+\)'
-      " Regex: ^\s*\(10\|20\)\>
-      "        ^ - Starting at the beginning of the string
-      "        \s* - optional whitespace
-      "        \zs - start the match here
-      "        \d\+ - any digits
-      "        \> - end of word (so it can't make 100 or 201)
-      let bufNbr = matchstr(line, '^\s*\zs\d\+\>')
-
-      " Add 0 to bufNbr to ensure Vim treats it as a Number
-      " for use with the getbufvar() function
-      if bufNbr !~ '^\d\+$' || getbufvar(bufNbr+0, '&modified') != 0
-        call s:BEError("Sorry, no write since last change for buffer ".bufNbr.", unable to delete")
-      else
-        let _bufNbrs = _bufNbrs . (_bufNbrs==''?'':' '). bufNbr 
-      endif
-    endif
-  endfor
-
-  " Okay, everything is good, delete or wipe the buffers.
-  call s:BEDeleteBuffer(_bufNbrs, a:type)
-
-  " Reactivate winmanager autocommand activity.
-  if exists("b:displayMode") && b:displayMode == "winmanager"
-    call WinManagerForceReSize("BufExplorer")
-    call WinManagerResumeAUs()
-  endif
-endfunction
-
-" BEDeleteBuffer {{{1
-function! s:BEDeleteBuffer(bufNbr, mode)
-  " This routine assumes that the buffer to be removed is on the current line.
-  try
-    if a:mode == "wipe"
-      exe "bwipe" a:bufNbr
-    else
-      exe "bdelete" a:bufNbr
-    endif
+" ToggleHelp {{{2
+function! s:ToggleHelp()
+    let g:bufExplorerDetailedHelp = !g:bufExplorerDetailedHelp
 
     setlocal modifiable
 
-    " Remove each of the lines beginning with the buffer numbers we are removing
-    " Regex: ^\s*\(10\|20\)\>
-    "        ^ - Starting at the beginning of the string
-    "        \s* - optional whitespace
-    "        \(10\|20\) - either a 10 or a 20
-    "        \> - end of word (so it can't make 100 or 201)
-    exec 'silent! g/^\s*\('.substitute(a:bufNbr, ' ', '\\|', 'g').'\)\>/d_'
+    " Save position.
+    normal! ma
+
+    " Remove old header.
+    if (s:firstBufferLine > 1)
+        exec "keepjumps 1,".(s:firstBufferLine - 1) "d _"
+    endif
+
+    call append(0, s:CreateHelp())
+
+    silent! normal! g`a
+    delmarks a
 
     setlocal nomodifiable
 
-    call s:BEDeleteBufferListing(a:bufNbr)
-  catch
-    call s:BEError(v:exception)
-  endtry
+    if exists("b:displayMode") && b:displayMode == "winmanager"
+        call WinManagerForceReSize("BufExplorer")
+    endif
 endfunction
 
-" BEClose {{{1
-function! s:BEClose(mode)
-  " Get only the listed buffers.
-  let listed = filter(copy(s:MRUList), "buflisted(v:val)")
+" GetHelpStatus {{{2
+function! s:GetHelpStatus()
+    let ret = '" Sorted by '.((g:bufExplorerReverseSort == 1) ? "reverse " : "").g:bufExplorerSortBy
+    let ret .= ' | '.((g:bufExplorerFindActive == 0) ? "Don't " : "")."Locate buffer"
+    let ret .= ((g:bufExplorerShowUnlisted == 0) ? "" : " | Show unlisted")
+    let ret .= ((g:bufExplorerShowTabBuffer == 0) ? "" : " | Show buffers/tab")
+    let ret .= ((g:bufExplorerOnlyOneTab == 1) ? "" : " | One tab/buffer")
+    let ret .= ' | '.((g:bufExplorerShowRelativePath == 0) ? "Absolute" : "Relative")
+    let ret .= ' '.((g:bufExplorerSplitOutPathName == 0) ? "Full" : "Split")." path"
 
-  " If we needed to split the main window, close the split one.
-"  if (s:splitMode)
-  if (s:splitMode != "" && a:mode == "quit")
-    exec "wincmd c"
-  endif
-
-  if len(listed) == 0
-    exe "enew"
-  else
-    for b in reverse(listed[0:1])
-      exec "keepjumps silent b ".b
-    endfor
-  endif
+    return ret
 endfunction
 
-" BEToggleSplitOutPathName {{{1
-function! s:BEToggleSplitOutPathName()
-  let g:bufExplorerSplitOutPathName = !g:bufExplorerSplitOutPathName
-  call s:BERebuildBufferList()
-  call s:BEUpdateHelpStatus()
+" CreateHelp {{{2
+function! s:CreateHelp()
+    if g:bufExplorerDefaultHelp == 0 && g:bufExplorerDetailedHelp == 0
+        let s:firstBufferLine = 1
+        return []
+    endif
+
+    let header = []
+
+    if g:bufExplorerDetailedHelp == 1
+        call add(header, '" Buffer Explorer ('.g:bufexplorer_version.')')
+        call add(header, '" --------------------------')
+        call add(header, '" <F1> : toggle this help')
+        call add(header, '" <enter> or o or Mouse-Double-Click : open buffer under cursor')
+        call add(header, '" <shift-enter> or t : open buffer in another tab')
+        call add(header, '" B : toggle if to save/use recent tab or not')
+        call add(header, '" d : delete buffer')
+        call add(header, '" D : wipe buffer')
+        call add(header, '" f : toggle find active buffer')
+        call add(header, '" p : toggle spliting of file and path name')
+        call add(header, '" q : quit')
+        call add(header, '" r : reverse sort')
+        call add(header, '" R : toggle showing relative or full paths')
+        call add(header, '" s : cycle thru "sort by" fields '.string(s:sort_by).'')
+        call add(header, '" S : reverse cycle thru "sort by" fields')
+        call add(header, '" T : toggle if to show only buffers for this tab or not')
+        call add(header, '" u : toggle showing unlisted buffers')
+    else
+        call add(header, '" Press <F1> for Help')
+    endif
+
+    if (!exists("b:displayMode") || b:displayMode != "winmanager") || (b:displayMode == "winmanager" && g:bufExplorerDetailedHelp == 1)
+        call add(header, s:GetHelpStatus())
+        call add(header, '"=')
+    endif
+
+    let s:firstBufferLine = len(header) + 1
+
+    return header
 endfunction
 
-" BEToggleShowRelativePath {{{1
-function! s:BEToggleShowRelativePath()
-  let g:bufExplorerShowRelativePath = !g:bufExplorerShowRelativePath
-  call s:BERebuildBufferList()
-  call s:BEUpdateHelpStatus()
+" GetBufferInfo {{{2
+function! s:GetBufferInfo(bufnr)
+    redir => bufoutput
+    buffers!
+    redir END
+
+    if (a:bufnr > 0)
+        " Since we are only interested in this specified buffer
+        " remove the other buffers listed
+        let bufoutput = substitute(bufoutput."\n", '^.*\n\(\s*'.a:bufnr.'\>.\{-}\)\n.*', '\1', '')
+    endif
+
+    let [all, allwidths, listedwidths] = [[], {}, {}]
+
+    for n in keys(s:types)
+        let allwidths[n] = []
+        let listedwidths[n] = []
+    endfor
+
+    " Loop over each line in the buffer.
+    for buf in split(bufoutput, '\n')
+        let bits = split(buf, '"')
+        let b = {"attributes": bits[0], "line": substitute(bits[2], '\s*', '', '')}
+
+        for [key, val] in items(s:types)
+            let b[key] = fnamemodify(bits[1], val)
+        endfor
+
+        if getftype(b.fullname) == "dir" && g:bufExplorerShowDirectories == 1
+            let b.shortname = "<DIRECTORY>"
+        endif
+
+        call add(all, b)
+
+        for n in keys(s:types)
+            call add(allwidths[n], len(b[n]))
+
+            if b.attributes !~ "u"
+                call add(listedwidths[n], len(b[n]))
+            endif
+        endfor
+    endfor
+
+    let [s:allpads, s:listedpads] = [{}, {}]
+
+    for n in keys(s:types)
+        let s:allpads[n] = repeat(' ', max(allwidths[n]))
+        let s:listedpads[n] = repeat(' ', max(listedwidths[n]))
+    endfor
+
+    return all
 endfunction
 
-" BEToggleShowUnlisted {{{1
-function! s:BEToggleShowUnlisted()
-  let g:bufExplorerShowUnlisted = !g:bufExplorerShowUnlisted
-  let num_bufs = s:BERebuildBufferList(g:bufExplorerShowUnlisted == 0)
-  call s:BEUpdateHelpStatus()
+" BuildBufferList {{{2
+function! s:BuildBufferList()
+    let lines = []
+
+    " Loop through every buffer.
+    for buf in s:raw_buffer_listing
+        " Skip unlisted buffers if we are not to show them.
+        if (!g:bufExplorerShowUnlisted && buf.attributes =~ "u")
+            " Skip unlisted buffers if we are not to show them.
+            continue
+        endif
+
+        " Ignore buffers with no name.
+        if empty(bufname(str2nr(buf.attributes))) == 1
+            continue
+        endif
+
+        if (g:bufExplorerShowTabBuffer)
+            let show_buffer = 0
+
+            for bufnr in s:tabSpace[tabpagenr()]
+                if (buf.attributes =~ '^\s*'.bufnr.'\>')
+                    " Only buffers shown on the current tabpagenr
+                    let show_buffer = 1
+                    break
+                endif
+            endfor
+
+            if show_buffer == 0
+                continue
+            endif
+        endif
+
+        let line = buf.attributes." "
+
+        if g:bufExplorerSplitOutPathName
+            let type = (g:bufExplorerShowRelativePath) ? "relativepath" : "path"
+            let path = buf[type]
+            let pad  = (g:bufExplorerShowUnlisted) ? s:allpads.shortname : s:listedpads.shortname
+            let line .= buf.shortname." ".strpart(pad.path, len(buf.shortname))
+        else
+            let type = (g:bufExplorerShowRelativePath) ? "relativename" : "fullname"
+            let path = buf[type]
+            let line .= path
+        endif
+
+        let pads = (g:bufExplorerShowUnlisted) ? s:allpads : s:listedpads
+
+        if !empty(pads[type])
+            let line .= strpart(pads[type], len(path))." "
+        endif
+
+        let line .= buf.line
+
+        call add(lines, line)
+    endfor
+
+    call setline(s:firstBufferLine, lines)
+
+    call s:SortListing()
 endfunction
 
-" BEToggleFindActive {{{1
-function! s:BEToggleFindActive()
-  let g:bufExplorerFindActive = !g:bufExplorerFindActive
-  call s:BEUpdateHelpStatus()
+" SelectBuffer {{{2
+function! s:SelectBuffer(...)
+    " Sometimes messages are not cleared when we get here so it looks like an
+    " error has occurred when it really has not.
+" 3/25/2012    echo ""
+
+    " Are we on a line with a file name?
+    if line('.') < s:firstBufferLine
+        exec "normal! \<CR>"
+        return
+    endif
+
+    let _bufNbr = str2nr(getline('.'))
+
+    " Check and see if we are running BufferExplorer via WinManager.
+    if exists("b:displayMode") && b:displayMode == "winmanager"
+        let _bufName = expand("#"._bufNbr.":p")
+
+        if (a:0 == 1) && (a:1 == "tab")
+            call WinManagerFileEdit(_bufName, 1)
+        else
+            call WinManagerFileEdit(_bufName, 0)
+        endif
+
+        return
+    endif
+
+    if bufexists(_bufNbr)
+        if bufnr("#") == _bufNbr && !exists("g:bufExplorerChgWin")
+            return s:Close()
+        endif
+
+        " Are we suppose to open the selected buffer in a tab?
+        if (a:0 == 1) && (a:1 == "tab")
+            " Yes, we are to open the selected buffer in a tab.
+
+            " Restore [BufExplorer] buffer.
+            exec "keepjumps silent buffer!".s:originBuffer
+
+            " Get the tab nmber where this bufer is located in.
+            let tabNbr = s:GetTabNbr(_bufNbr)
+
+            " Was the tab found?
+            if tabNbr == 0
+                " _bufNbr is not opened in any tabs. Open a new tab with the selected buffer in it.
+                exec "999tab split +buffer" . _bufNbr
+            else
+                " The _bufNbr is already opened in a tab, go to that tab.
+                exec tabNbr . "tabnext"
+
+                " Focus window.
+                exec s:GetWinNbr(tabNbr, _bufNbr) . "wincmd w"
+            endif
+        else
+            " No, the user did not ask to open the selected buffer in a tab.
+
+            " Are we suppose to move to the tab where the active buffer is?
+            if exists("g:bufExplorerChgWin")
+                exe g:bufExplorerChgWin."wincmd w"
+            elseif bufloaded(_bufNbr) && g:bufExplorerFindActive
+                call s:Close()
+
+                " Get the tab number where this buffer is located in.
+                let tabNbr = s:GetTabNbr(_bufNbr)
+
+                " Was the tab found?
+                if tabNbr != 0
+                    " Yes, the buffer is located in a tab. Go to that tab number.
+                    exec tabNbr . "tabnext"
+                else
+                    "Nope, the buffer is not in a tab. Simply switch to that
+                    "buffer.
+                    let _bufName = expand("#"._bufNbr.":p")
+                    exec _bufName ? "drop ".escape(_bufName, " ") : "buffer "._bufNbr
+                endif
+            endif
+
+            " Switch to the buffer.
+            exec "keepalt keepjumps silent b!" _bufNbr
+        endif
+
+        " Make the buffer 'listed' again.
+        call setbufvar(_bufNbr, "&buflisted", "1")
+
+        " Call any associated function references. g:bufExplorerFuncRef may be
+        " an individual function reference or it may be a list containing
+        " function references. It will ignore anything that's not a function
+        " reference.
+        "
+        " See  :help FuncRef  for more on function references.
+        if exists("g:BufExplorerFuncRef")
+            if type(g:BufExplorerFuncRef) == 2
+                keepj call g:BufExplorerFuncRef()
+            elseif type(g:BufExplorerFuncRef) == 3
+                for FncRef in g:BufExplorerFuncRef
+                    if type(FncRef) == 2
+                        keepj call FncRef()
+                    endif
+                endfor
+            endif
+        endif
+    else
+        call s:Error("Sorry, that buffer no longer exists, please select another")
+        call s:DeleteBuffer(_bufNbr, "wipe")
+    endif
 endfunction
 
-" BEToggleShowTabBuffer {{{1
-function! s:BEToggleShowTabBuffer()
-  let g:bufExplorerShowTabBuffer = !g:bufExplorerShowTabBuffer
-  call s:BEDisplayBufferList()
+" RemoveBuffer {{{2
+function! s:RemoveBuffer(mode)
+    " Are we on a line with a file name?
+    if line('.') < s:firstBufferLine
+        return
+    endif
+
+    " Do not allow this buffer to be deleted if it is the last one.
+    if len(s:MRUList) == 1
+        call s:Error("Sorry, you are not allowed to delete the last buffer")
+        return
+    endif
+
+    " These commands are to temporarily suspend the activity of winmanager.
+    if exists("b:displayMode") && b:displayMode == "winmanager"
+        call WinManagerSuspendAUs()
+    end
+
+    let _bufNbr = str2nr(getline('.'))
+
+    if getbufvar(_bufNbr, '&modified') == 1
+        call s:Error("Sorry, no write since last change for buffer "._bufNbr.", unable to delete")
+        return
+    else
+        " Okay, everything is good, delete or wipe the buffer.
+        call s:DeleteBuffer(_bufNbr, a:mode)
+    endif
+
+    " Reactivate winmanager autocommand activity.
+    if exists("b:displayMode") && b:displayMode == "winmanager"
+        call WinManagerForceReSize("BufExplorer")
+        call WinManagerResumeAUs()
+    end
 endfunction
 
-" BEToggleOnlyOneTab {{{1
-function! s:BEToggleOnlyOneTab()
-  let g:bufExplorerOnlyOneTab = !g:bufExplorerOnlyOneTab
-  call s:BEDisplayBufferList()
+" DeleteBuffer {{{2
+function! s:DeleteBuffer(buf, mode)
+    " This routine assumes that the buffer to be removed is on the current line.
+    try
+        if a:mode == "wipe"
+            exe "silent bwipe" a:buf
+        else
+            exe "silent bdelete" a:buf
+        endif
+
+        setlocal modifiable
+        normal! "_dd
+        setlocal nomodifiable
+
+        " Delete the buffer from the raw buffer list.
+        call filter(s:raw_buffer_listing, 'v:val.attributes !~ " '.a:buf.' "')
+    catch
+        call s:Error(v:exception)
+    endtry
 endfunction
 
-" BERebuildBufferList {{{1
-function! s:BERebuildBufferList(...)
-  setlocal modifiable
+" Close {{{2
+function! s:Close()
+    " Get only the listed buffers.
+    let listed = filter(copy(s:MRUList), "buflisted(v:val)")
 
-  let curPos = getpos('.')
+    " If we needed to split the main window, close the split one.
+    if (s:splitMode != "")
+        exec "wincmd c"
+    endif
 
-  if a:0
-    " Clear the list first.
-    exec "keepjumps ".s:firstBufferLine.',$d "_'
-  endif
+    " Check to see if there are anymore buffers listed.
+    if len(listed) == 0
+        " Since there are no buffers left to switch to, open a new empty
+        " buffers.
+        exe "enew"
+    else
+        " Since there are buffers left to switch to, swith to them...
+        for b in reverse(listed[0:1])
+            exec "keepjumps silent b ".b
+        endfor
+    endif
 
-  let num_bufs = s:BEBuildBufferList()
-
-  call setpos('.', curPos)
-
-  setlocal nomodifiable
-
-  return num_bufs
+    " Clear any messages.
+    echo
 endfunction
 
-" BEUpdateHelpStatus {{{1
-function! s:BEUpdateHelpStatus()
-  setlocal modifiable
-
-  let text = s:BEGetHelpStatus()
-  call setline(s:firstBufferLine - 2, text)
-
-  setlocal nomodifiable
+" ToggleSplitOutPathName {{{2
+function! s:ToggleSplitOutPathName()
+    let g:bufExplorerSplitOutPathName = !g:bufExplorerSplitOutPathName
+    call s:RebuildBufferList()
+    call s:UpdateHelpStatus()
 endfunction
 
-" BEMRUCmp {{{1
-function! s:BEMRUCmp(line1, line2)
-  return index(s:MRUList, str2nr(a:line1)) - index(s:MRUList, str2nr(a:line2))
+" ToggleShowRelativePath {{{2
+function! s:ToggleShowRelativePath()
+    let g:bufExplorerShowRelativePath = !g:bufExplorerShowRelativePath
+    call s:RebuildBufferList()
+    call s:UpdateHelpStatus()
 endfunction
 
-" BESortReverse {{{1
-function! s:BESortReverse()
-  let g:bufExplorerReverseSort = !g:bufExplorerReverseSort
-
-  call s:BEReSortListing()
+" ToggleShowTabBuffer {{{2