Display the kind (type) of the tag on the status bar

Using different method than the first attempt.

LICENSE

@@ -0,0 +1,82 @@
+TAGBAR LICENSE
+
+This is the normal Vim license (see ':h license' in Vim) with the necessary
+replacements for the project and maintainer information.
+
+I)  There are no restrictions on distributing unmodified copies of Tagbar
+    except that they must include this license text.  You can also distribute
+    unmodified parts of Tagbar, likewise unrestricted except that they must
+    include this license text.  You are also allowed to include executables
+    that you made from the unmodified Tagbar sources, plus your own usage
+    examples and scripts.
+
+II) It is allowed to distribute a modified (or extended) version of Tagbar,
+    including executables and/or source code, when the following four
+    conditions are met:
+    1) This license text must be included unmodified.
+    2) The modified Tagbar must be distributed in one of the following five ways:
+       a) If you make changes to Tagbar yourself, you must clearly describe in
+          the distribution how to contact you.  When the maintainer asks you
+          (in any way) for a copy of the modified Tagbar you distributed, you
+          must make your changes, including source code, available to the
+          maintainer without fee.  The maintainer reserves the right to
+          include your changes in the official version of Tagbar.  What the
+          maintainer will do with your changes and under what license they
+          will be distributed is negotiable.  If there has been no negotiation
+          then this license, or a later version, also applies to your changes.
+          The current maintainer is Jan Larres <jan@majutsushi.net>.  If this
+          changes it will be announced in appropriate places (most likely
+          majutsushi.github.io/tagbar and/or github.com/majutsushi/tagbar).
+          When it is completely impossible to contact the maintainer, the
+          obligation to send him your changes ceases.  Once the maintainer has
+          confirmed that he has received your changes they will not have to be
+          sent again.
+       b) If you have received a modified Tagbar that was distributed as
+          mentioned under a) you are allowed to further distribute it
+          unmodified, as mentioned at I).  If you make additional changes the
+          text under a) applies to those changes.
+       c) Provide all the changes, including source code, with every copy of
+          the modified Tagbar you distribute.  This may be done in the form of
+          a context diff.  You can choose what license to use for new code you
+          add.  The changes and their license must not restrict others from
+          making their own changes to the official version of Tagbar.
+       d) When you have a modified Tagbar which includes changes as mentioned
+          under c), you can distribute it without the source code for the
+          changes if the following three conditions are met:
+          - The license that applies to the changes permits you to distribute
+            the changes to the Tagbar maintainer without fee or restriction, and
+            permits the Tagbar maintainer to include the changes in the official
+            version of Tagbar without fee or restriction.
+          - You keep the changes for at least three years after last
+            distributing the corresponding modified Tagbar.  When the
+            maintainer or someone who you distributed the modified Tagbar to
+            asks you (in any way) for the changes within this period, you must
+            make them available to him.
+          - You clearly describe in the distribution how to contact you.  This
+            contact information must remain valid for at least three years
+            after last distributing the corresponding modified Tagbar, or as
+            long as possible.
+       e) When the GNU General Public License (GPL) applies to the changes,
+          you can distribute the modified Tagbar under the GNU GPL version 2
+          or any later version.
+    3) A message must be added, at least in the documentation, such that the
+       user of the modified Tagbar is able to see that it was modified.  When
+       distributing as mentioned under 2)e) adding the message is only
+       required for as far as this does not conflict with the license used for
+       the changes.
+    4) The contact information as required under 2)a) and 2)d) must not be
+       removed or changed, except that the person himself can make
+       corrections.
+
+III) If you distribute a modified version of Tagbar, you are encouraged to use
+     the Tagbar license for your changes and make them available to the
+     maintainer, including the source code.  The preferred way to do this is
+     by e-mail or by uploading the files to a server and e-mailing the URL. If
+     the number of changes is small (e.g., a modified Makefile) e-mailing a
+     context diff will do.  The e-mail address to be used is
+     <jan@majutsushi.net>
+
+IV)  It is not allowed to remove this license from the distribution of the
+     Tagbar sources, parts of it or from a modified version.  You may use this
+     license for previous Tagbar releases instead of the license that they
+     came with, at your option.

README.md

@@ -1,19 +1,89 @@
-# Overview
+# Tagbar: a class outline viewer for Vim
 
-Tagbar is a vim plugin for browsing the tags of source code files.
-It provides a sidebar that displays the ctags-generated tags of the current file, ordered by their scope. This means that for example methods in C++ are displayed under the class they are defined in.
+## What Tagbar is
 
-Check out the homepage at http://majutsushi.github.io/tagbar/ for more information.
+Tagbar is a Vim plugin that provides an easy way to browse the tags of the
+current file and get an overview of its structure. It does this by creating a
+sidebar that displays the ctags-generated tags of the current file, ordered by
+their scope. This means that for example methods in C++ are displayed under
+the class they are defined in.
 
-# Support for additional filetypes
+## What Tagbar is not
 
-For filetypes that are not supported by Exuberant Ctags check out [the wiki](https://github.com/majutsushi/tagbar/wiki) to see whether other projects offer support for them and how to use them. Please add any other projects/configurations that you find or create yourself so that others can benefit from them, too.
+Tagbar is not a general-purpose tool for managing `tags` files. It only
+creates the tags it needs on-the-fly in-memory without creating any files.
+`tags` file management is provided by other plugins, like for example
+[easytags](https://github.com/xolox/vim-easytags).
 
-# Important: If the file structure is displayed wrong
+## Dependencies
 
-If you notice that there are some errors in the way your file's structure is displayed in Tagbar, please make sure that the bug is actually in Tagbar before you report a bug. Since Tagbar uses [exuberant-ctags](http://ctags.sourceforge.net/) and compatible programs to do the actual file parsing, it is likely that the bug is actually in one of those programs instead.
+[Vim 7.0](http://www.vim.org/) (But see note below)  
+[Exuberant ctags 5.5](http://ctags.sourceforge.net/)
 
-There is an example in `:h tagbar-issues` about how to run ctags manually so you can determine where the bug actually is. If the bug is actually in ctags, please report it on their website instead, as there is nothing I can do about it in Tagbar. Thank you!
+## Installation
 
-You can also have a look at ctags bugs that have previously been filed on Tagbar here:  
-https://github.com/majutsushi/tagbar/issues?labels=ctags-bug&page=1&state=closed
+Extract the archive or clone the repository into a directory in your
+`'runtimepath'`, or use a plugin manager of your choice like
+[pathogen](https://github.com/tpope/vim-pathogen). Don't forget to run
+`:helptags` if your plugin manager doesn't do it for you so you can access the
+documentation with `:help tagbar`.
+
+Note: Vim versions < 7.0.167 have a bug that prevents Tagbar from working. If
+you are affected by this use this alternate Tagbar download instead:
+[zip](https://github.com/majutsushi/tagbar/zipball/70fix). It is on par with
+version 2.2 but probably won't be updated after that due to the amount of
+changes required.
+
+If the ctags executable is not installed in one of the directories in your
+`$PATH` environment variable you have to set the `g:tagbar_ctags_bin`
+variable, see the documentation for more info.
+
+## Quickstart
+
+Put something like the following into your ~/.vimrc:
+
+```vim
+nmap <F8> :TagbarToggle<CR>
+```
+
+If you do this the F8 key will toggle the Tagbar window. You can of course use
+any shortcut you want. For more flexible ways to open and close the window
+(and the rest of the functionality) see the documentation.
+
+## Support for additional filetypes
+
+For filetypes that are not supported by Exuberant Ctags check out [the
+wiki](https://github.com/majutsushi/tagbar/wiki) to see whether other projects
+offer support for them and how to use them. Please add any other
+projects/configurations that you find or create yourself so that others can
+benefit from them, too.
+
+## Note: If the file structure display is wrong
+
+If you notice that there are some errors in the way your file's structure is
+displayed in Tagbar, please make sure that the bug is actually in Tagbar
+before you report an issue. Since Tagbar uses
+[exuberant-ctags](http://ctags.sourceforge.net/) and compatible programs to do
+the actual file parsing, it is likely that the bug is actually in the program
+responsible for that filetype instead.
+
+There is an example in `:h tagbar-issues` about how to run ctags manually so
+you can determine where the bug actually is. If the bug is actually in ctags,
+please report it on their website instead, as there is nothing I can do about
+it in Tagbar. Thank you!
+
+You can also have a look at [ctags bugs that have previously been filed
+against Tagbar](https://github.com/majutsushi/tagbar/issues?labels=ctags-bug&page=1&state=closed).
+
+## Screenshots
+
+![screenshot1](https://i.imgur.com/Sf9Ls2r.png)
+![screenshot2](https://i.imgur.com/n4bpPv3.png)
+
+## License
+
+Vim license, see LICENSE
+
+## Maintainer
+
+Jan Larres <[jan@majutsushi.net](mailto:jan@majutsushi.net)>

doc/tagbar.txt

@@ -3,7 +3,7 @@
 Author:         Jan Larres <jan@majutsushi.net>
 Licence:        Vim licence, see |license|
 Homepage:       http://majutsushi.github.com/tagbar/
-Version:        2.6
+Version:        2.6.1
 
 ==============================================================================
 Contents                                            *tagbar* *tagbar-contents*
@@ -108,14 +108,13 @@ The following features are supported by Tagbar:
 ------------------------------------------------------------------------------
 OTHER CTAGS-COMPATIBLE PROGRAMS                                 *tagbar-other*
 
-Tagbar theoretically also supports filetype-specific programs that can output
-tag information that is compatible with ctags. However due to potential
-incompatibilities this may not always completely work. Tagbar has been tested
-with doctorjs/jsctags and will use that if present, other programs require
-some configuration (see |tagbar-extend|). If a program does not work even with
-correct configuration please contact me.
+Tagbar also supports filetype-specific programs that can produce
+ctags-compatible output, as long as these programs can write to the standard
+output. Tagbar has been tested with doctorjs/jsctags and will use that if
+present, other programs require some configuration (see |tagbar-extend|). If a
+program does not work even with correct configuration please contact me.
 
-Note: Please check |tagbar-issues| for some possible issues with jsctags.
+Note: Please check |tagbar-issues| for some potential issues with jsctags.
 
 ==============================================================================
 2. Requirements                                          *tagbar-requirements*
@@ -133,7 +132,7 @@ The following requirements have to be met in order to be able to use tagbar:
 
     Tagbar will work on any platform that ctags runs on -- this includes
     UNIX derivatives, Mac OS X and Windows. Note that other versions like
-    GNU ctags will not work.
+    BSD ctags will not work.
     Tagbar generates the tag information by itself and doesn't need (or use)
     already existing tag files.
   - File type detection must be turned on in vim. This can be done with the
@@ -196,11 +195,11 @@ and have it close automatically on tag selection regardless of the
 |g:tagbar_autoclose| setting.
 
 Pausing the Tagbar window~
-Use |:TagbarTogglePause| to toggle freezing the Tagbar window on its currently
-displayed file. Freezing the window stops the Tagbar contents from changing
-when switching to a different source file. All Tagbar functionality continues
-to work as expected. Unfreezing the window will cause it to load the current
-source file.
+Use |:TagbarTogglePause| to toggle freezing/locking the Tagbar window on its
+currently displayed file. Freezing the window stops the Tagbar contents from
+changing when switching to a different source file. All Tagbar functionality
+continues to work as expected. Unfreezing the window will cause it to load the
+current source file.
 
 Jumping to tags~
 When you're inside the Tagbar window you can jump to the definition of a tag
@@ -251,7 +250,8 @@ COMMANDS                                                     *tagbar-commands*
     'j'   Jump to Tagbar window if already open
     'c'   Close Tagbar on tag selection (just as if |g:tagbar_autoclose| were
           set to 1, but doesn't imply 'f'), but only if the Tagbar window was
-          opened using this command.
+          opened using this command. If this is used the "c" flag will be
+          shown in the statusline of the Tagbar window.
 
     For example, the following command would always jump to the Tagbar window,
     opening it first if necessary, but keep it open after selecting a tag
@@ -311,7 +311,7 @@ KEY MAPPINGS                                                     *tagbar-keys*
 
 The following mappings are valid in the Tagbar window:
 
-<F1>          Display key mapping help.
+<F1>/?        Display key mapping help.
                 Map option: tagbar_map_help
 <CR>/<Enter>  Jump to the tag under the cursor. Doesn't work for pseudo-tags
               or generic headers.
@@ -331,6 +331,9 @@ P             Open the tag in a |preview-window|.
 <Space>       Display the prototype of the current tag (i.e. the line defining
               it) in the command line.
                 Map option: tagbar_map_showproto
+v             Hide tags that are declared non-public. Tags without any
+              visibility information will still be shown.
+                Map option: tagbar_map_hidenonpublic
 +/zo          Open the fold under the cursor.
                 Map option: tagbar_map_openfold
 -/zc          Close the fold under the cursor or the current one if there is
@@ -343,8 +346,14 @@ o/za          Toggle the fold under the cursor or the current one if there is
                 Map option: tagbar_map_openallfolds
 =/zM          Close all folds by setting foldlevel to 0.
                 Map option: tagbar_map_closeallfolds
+zj            Go to the start of the next fold, like the standard Vim |zj|.
+                Map option: tagbar_map_nextfold
+zk            Go to the end of the previous fold, like the standard Vim |zk|.
+                Map option: tagbar_map_prevfold
 s             Toggle sort order between name and file order.
                 Map option: tagbar_map_togglesort
+c             Toggle the |g:tagbar_autoclose| option.
+                Map option: tagbar_map_toggleautoclose
 x             Toggle zooming the window.
                 Map option: tagbar_map_zoomwin
 q             Close the Tagbar window.
@@ -382,11 +391,29 @@ Default: 0
 By default the Tagbar window will be opened on the right-hand side of vim. Set
 this option to open it on the left instead.
 
+If |g:tagbar_vertical| is used then setting this variable will open the Tagbar
+window at the top, otherwise it will open at the bottom.
+
 Example:
 >
         let g:tagbar_left = 1
 <
 
+                                                           *g:tagbar_vertical*
+g:tagbar_vertical~
+Default: 0
+
+If this is set to a positive value then the Tagbar window will be opened at
+the top or bottom of the Vim window instead of at the side. This can be useful
+for monitors that have been rotated into a vertical position. The value of
+this variable will determine the number of lines to use for the Tagbar window.
+See |g:tagbar_left| for configuring the position of the window.
+
+Example:
+>
+        let g:tagbar_vertical = 30
+<
+
                                                               *g:tagbar_width*
 g:tagbar_width~
 Default: 40
@@ -398,12 +425,30 @@ Example:
         let g:tagbar_width = 30
 <
 
+                                                          *g:tagbar_zoomwidth*
+g:tagbar_zoomwidth~
+Default: 1
+
+Width of the Tagbar window when zoomed.
+
+Possible values are:
+  1: Use the maximum width available.
+  0: Use the width of the longest currently visible tag.
+  >1: Use this width in characters.
+
+Example:
+>
+        let g:tagbar_zoomwidth = 0
+<
+
                                                           *g:tagbar_autoclose*
 g:tagbar_autoclose~
 Default: 0
 
 If you set this option the Tagbar window will automatically close when you
-jump to a tag. This implies |g:tagbar_autofocus|.
+jump to a tag. This implies |g:tagbar_autofocus|. If enabled the "C" flag will
+be shown in the statusline of the Tagbar window. This can also be toggled with
+a key, see |tagbar-keys|.
 
 Example:
 >
@@ -490,6 +535,20 @@ Example:
         let g:tagbar_show_linenumbers = 2
 <
 
+                                                     *g:tagbar_hide_nonpublic*
+g:tagbar_hide_nonpublic~
+Default: 0
+
+Hide tags that are declared non-public. Tags without any visibility
+information will still be shown. If enabled the "v" flag will be shown in the
+statusline of the Tagbar window. This can also be toggled with a key, see
+|tagbar-keys|.
+
+Example:
+>
+        let g:tagbar_hide_nonpublic = 1
+<
+
                                                              *g:tagbar_expand*
 g:tagbar_expand~
 Default: 0
@@ -553,7 +612,7 @@ Default: 0
 If this variable is set to 1 and the current tag is inside of a closed fold
 then the folds will be opened as much as needed for the tag to be visible so
 it can be highlighted. If it is set to 0 then the folds will only be opened
-when opening the Tagbar window and the current tag is insided a closed fold,
+when opening the Tagbar window and the current tag is inside a closed fold,
 otherwise the folds won't be opened and the parent tag will be highlighted
 instead. If it is set to 2 then the folds will never be opened automatically.
 
@@ -566,7 +625,7 @@ Example:
 
                                                      *g:tagbar_previewwin_pos*
 g:tagbar_previewwin_pos~
-Default: topleft
+Default: "topleft", or "rightbelow vertical" if |g:tagbar_vertical| is set
 
 The position of the preview window. Valid values are the window splitting
 commands that are described starting from |:vertical|. Set it to an empty
@@ -609,8 +668,8 @@ system is different from the one set in Vim, i.e. the 'encoding' option. For
 example, if you use a Simplified Chinese Windows version that has a system
 encoding of "cp936", and you have set 'encoding' to "utf-8", then you would
 have to set this variable to "cp936".
-Note that this requires Vim to be compiled with the |+multi_byte| and (unless
-your encoding is latin1) |+iconv| features to work.
+Note that this requires Vim to be compiled with the |+multi_byte| and |+iconv|
+features to work.
 
 Example:
 >
@@ -624,11 +683,13 @@ Default: undefined
 This is the name of a function whose return value will be used to draw the
 statusline of the Tagbar window.
 
-The function has to take three arguments:
+The function has to take four arguments:
   1. current: Whether Tagbar is the current window; 0 or 1.
   2. sort: The sort order of the tags; 'Name' if they are sorted by name and
      'Order' if they are sorted by their order of appearance in the file.
   3. fname: The name of the file that the tags belong to.
+  4. flags: A list of characters that represent various state in the Tagbar
+     window.
 
 In order to avoid possible future additions to the arguments resulting in an
 error it is recommended to add an additional vararg to the signature (see
@@ -637,9 +698,13 @@ error it is recommended to add an additional vararg to the signature (see
 Here is an example that, when put into your vimrc, will emulate Tagbar's
 default statusline:
 >
-        function! TagbarStatusFunc(current, sort, fname, ...) abort
+        function! TagbarStatusFunc(current, sort, fname, flags, ...) abort
             let colour = a:current ? '%#StatusLine#' : '%#StatusLineNC#'
-            return colour . '[' . a:sort . '] ' . a:fname
+            let flagstr = join(flags, '')
+            if flagstr != ''
+                let flagstr = '[' . flagstr . '] '
+            endif
+            return colour . '[' . sort . '] ' . flagstr . fname
         endfunction
         let g:tagbar_status_func = 'TagbarStatusFunc'
 <
@@ -763,6 +828,9 @@ tagbar#currenttag({format}, {default} [, {flags}])
     'p'   Display the raw prototype instead of the parsed tag. This can be
           useful in cases where ctags doesn't report some information, like
           the signature. Note that this can get quite long.
+    'k'   This is essentially the same as in 'f' flag - it will display the
+          full hierarchy of the tag, and additionally will provide the
+          information of the kind of the tag.
 
     For example, if you put the following into your statusline: >
         %{tagbar#currenttag('[%s] ','')}
@@ -1137,10 +1205,11 @@ imporant tips to get it to integrate well with Tagbar:
     (stdout), it doesn't generate files and reads them in after that. So make
     sure that your program has an option to output the tags on stdout.
   - Some fields are supported for providing additional information about a
-    tag. One field is required: the "kind" field as a single letter without
-    a "kind:" fieldname. This field has to be the first one in the list. All
-    other fields need to have a fieldname in order to determine what they are.
-    The following fields are supported for all filetypes:
+    tag. One field is required: the "kind" field as a single letter, either
+    with or without a "kind:" fieldname. If it is used without the fieldname
+    then it has to be the first field in the list. All other fields need to
+    have a fieldname in order to determine what they are. The following fields
+    are supported for all filetypes:
 
         * line:      The line number of the tag.
         * column:    The column number of the tag.
@@ -1172,12 +1241,27 @@ ctags manually execute the following command in a terminal:
 If you set the |g:tagbar_ctags_bin| variable you probably have to use the same
 value here instead of simply "ctags".
 
-If Tagbar doesn't seem to work at all, but you don't get any error messages,
-you can use Tagbar's debug mode to try to find the source of the problem (see
-|tagbar-commands| on how to invoke it). In that case you should especially pay
-attention to the reported file type and the ctags command line in the log
-file.
+If something more fundamental isn't working right then try running the
+|:messages| command to see if Tagbar printed any error messages that might
+have been missed.
 
+If the bug does seem to be in Tagbar then you can use Tagbar's debug mode to
+try to find the source of the problem. Usually you would use it like this:
+
+  1. Open Vim without loading any files.
+  2. Run :TagbarDebug.
+  3. Open the file you are having problems with.
+  4. Open Tagbar. If the problem is with the statusline functionality this
+     step may not be necessary.
+  5. Exit Vim.
+
+This should leave a file called "tagbardebug.log" in the current directory.
+See |tagbar-commands| for more information on the debug commands. When you
+look at the file you should especially pay attention to the reported file type
+and the ctags command line in the log file.
+
+
+Known issues~
 
   - jsctags has to be newer than 2011-01-06 since it needs the "-f" option to
     work. Also, the output of jsctags seems to be a bit unreliable at the
@@ -1231,6 +1315,13 @@ file.
 ==============================================================================
 8. History                                                    *tagbar-history*
 
+2.6.1 (2014-01-23)
+    - Automatically close the preview window when jumping to a tag
+    - Don't forget the previous window in certain situations, which was
+      causing problems with for example fugitive
+    - Fixed toggling kind-specific folds
+    - Fixed ctags error that can happen with Cygwin
+
 2.6 (2013-12-06)
     - Added possibility to show tags in the preview window, either manually or
       automatically.
@@ -1403,10 +1494,12 @@ Jan Christoph Ebersbach
 Vadim Fint
 Leandro Freitas
 Ingo Karkat
+Audrius Kažukauskas
 Michael McClimon
 Seth Milliken
 Kien N
 Darcy Parker
+fritzophrenic
 pielgrzym
 Taybin Rutkin
 Kian Ryan

plugin/tagbar.vim

@@ -4,7 +4,7 @@
 " Author:      Jan Larres <jan@majutsushi.net>
 " Licence:     Vim licence
 " Website:     http://majutsushi.github.com/tagbar/
-" Version:     2.6
+" Version:     2.6.1
 " Note:        This plugin was heavily inspired by the 'Taglist' plugin by
 "              Yegappan Lakshmanan and uses a small amount of code from it.
 "
@@ -48,29 +48,39 @@ function! s:init_var(var, value) abort
     endif
 endfunction
 
-let s:options = [
-    \ ['autoclose', 0],
-    \ ['autofocus', 0],
-    \ ['autopreview', 0],
-    \ ['autoshowtag', 0],
-    \ ['compact', 0],
-    \ ['expand', 0],
-    \ ['foldlevel', 99],
-    \ ['indent', 2],
-    \ ['left', 0],
-    \ ['previewwin_pos', 'topleft'],
-    \ ['show_visibility', 1],
-    \ ['show_linenumbers', 0],
-    \ ['singleclick', 0],
-    \ ['sort', 1],
-    \ ['systemenc', &encoding],
-    \ ['width', 40],
-\ ]
+function! s:setup_options() abort
+    if !exists('g:tagbar_vertical') || g:tagbar_vertical == 0
+        let previewwin_pos = 'topleft'
+    else
+        let previewwin_pos = 'rightbelow vertical'
+    endif
+    let options = [
+        \ ['autoclose', 0],
+        \ ['autofocus', 0],
+        \ ['autopreview', 0],
+        \ ['autoshowtag', 0],
+        \ ['compact', 0],
+        \ ['expand', 0],
+        \ ['foldlevel', 99],
+        \ ['hide_nonpublic', 0],
+        \ ['indent', 2],
+        \ ['left', 0],
+        \ ['previewwin_pos', previewwin_pos],
+        \ ['show_visibility', 1],
+        \ ['show_linenumbers', 0],
+        \ ['singleclick', 0],
+        \ ['sort', 1],
+        \ ['systemenc', &encoding],
+        \ ['vertical', 0],
+        \ ['width', 40],
+        \ ['zoomwidth', 1],
+    \ ]
 
-for [opt, val] in s:options
-    call s:init_var(opt, val)
-endfor
-unlet s:options
+    for [opt, val] in options
+        call s:init_var(opt, val)
+    endfor
+endfunction
+call s:setup_options()
 
 if !exists('g:tagbar_iconchars')
     if has('multi_byte') && has('unix') && &encoding == 'utf-8' &&
@@ -81,31 +91,37 @@ if !exists('g:tagbar_iconchars')
     endif
 endif
 
-let s:keymaps = [
-    \ ['jump',       '<CR>'],
-    \ ['preview',    'p'],
-    \ ['previewwin', 'P'],
-    \ ['nexttag',    '<C-N>'],
-    \ ['prevtag',    '<C-P>'],
-    \ ['showproto',  '<Space>'],
-    \
-    \ ['openfold',      ['+', '<kPlus>', 'zo']],
-    \ ['closefold',     ['-', '<kMinus>', 'zc']],
-    \ ['togglefold',    ['o', 'za']],
-    \ ['openallfolds',  ['*', '<kMultiply>', 'zR']],
-    \ ['closeallfolds', ['=', 'zM']],
-    \
-    \ ['togglesort', 's'],
-    \ ['zoomwin',    'x'],
-    \ ['close',      'q'],
-    \ ['help',       '<F1>'],
-\ ]
+function! s:setup_keymaps() abort
+    let keymaps = [
+        \ ['jump',          '<CR>'],
+        \ ['preview',       'p'],
+        \ ['previewwin',    'P'],
+        \ ['nexttag',       '<C-N>'],
+        \ ['prevtag',       '<C-P>'],
+        \ ['showproto',     '<Space>'],
+        \ ['hidenonpublic', 'v'],
+        \
+        \ ['openfold',      ['+', '<kPlus>', 'zo']],
+        \ ['closefold',     ['-', '<kMinus>', 'zc']],
+        \ ['togglefold',    ['o', 'za']],
+        \ ['openallfolds',  ['*', '<kMultiply>', 'zR']],
+        \ ['closeallfolds', ['=', 'zM']],
+        \ ['nextfold',      'zj'],
+        \ ['prevfold',      'zk'],
+        \
+        \ ['togglesort',      's'],
+        \ ['toggleautoclose', 'c'],
+        \ ['zoomwin',         'x'],
+        \ ['close',           'q'],
+        \ ['help',            ['<F1>', '?']],
+    \ ]
 
-for [map, key] in s:keymaps
-    call s:init_var('map_' . map, key)
-    unlet key
-endfor
-unlet s:keymaps
+    for [map, key] in keymaps
+        call s:init_var('map_' . map, key)
+        unlet key
+    endfor
+endfunction
+call s:setup_keymaps()
 
 augroup TagbarSession
     autocmd!

syntax/tagbar.vim

@@ -3,7 +3,7 @@
 " Author:      Jan Larres <jan@majutsushi.net>
 " Licence:     Vim licence
 " Website:     http://majutsushi.github.com/tagbar/
-" Version:     2.6
+" Version:     2.6.1
 
 scriptencoding utf-8