From 34e72ff7f5b07cbe02e82843137047dc0907b066 Mon Sep 17 00:00:00 2001
From: gryf <gryf73@gmail.com>
Date: Fri, 9 Dec 2011 10:00:06 +0100
Subject: [PATCH] Added calendar plugin, update of tagbar

---
 .../tagbar.vim                                |  267 ++--
 doc/tagbar.txt                                |  147 +-
 doc/tags                                      |    4 +-
 plugin/calendar.vim                           | 1328 +++++++++++++++++
 plugin/tagbar.vim                             |  111 ++
 syntax/tagbar.vim                             |   32 +-
 6 files changed, 1760 insertions(+), 129 deletions(-)
 rename plugin/tagbar.vim_disabled => autoload/tagbar.vim (93%)
 create mode 100644 plugin/calendar.vim
 create mode 100644 plugin/tagbar.vim

diff --git a/plugin/tagbar.vim_disabled b/autoload/tagbar.vim
similarity index 93%
rename from plugin/tagbar.vim_disabled
rename to autoload/tagbar.vim
index 978788a..3f37085 100644
--- a/plugin/tagbar.vim_disabled
+++ b/autoload/tagbar.vim
@@ -4,7 +4,7 @@
 " Author:      Jan Larres <jan@majutsushi.net>
 " Licence:     Vim licence
 " Website:     http://majutsushi.github.com/tagbar/
-" Version:     2.1
+" Version:     2.2
 " Note:        This plugin was heavily inspired by the 'Taglist' plugin by
 "              Yegappan Lakshmanan and uses a small amount of code from it.
 "
@@ -18,19 +18,12 @@
 "              use of this software.
 " ============================================================================
 
-if &cp || exists('g:loaded_tagbar')
-    finish
-endif
+scriptencoding utf-8
 
 " Initialization {{{1
 
 " Basic init {{{2
 
-if v:version < 700
-    echomsg 'Tagbar: Vim version is too old, Tagbar requires at least 7.0'
-    finish
-endif
-
 if !exists('g:tagbar_ctags_bin')
     if executable('ctags-exuberant')
         let g:tagbar_ctags_bin = 'ctags-exuberant'
@@ -38,6 +31,12 @@ if !exists('g:tagbar_ctags_bin')
         let g:tagbar_ctags_bin = 'exuberant-ctags'
     elseif executable('exctags')
         let g:tagbar_ctags_bin = 'exctags'
+    elseif has('macunix') && executable('/usr/local/bin/ctags')
+        " Homebrew default location
+        let g:tagbar_ctags_bin = '/usr/local/bin/ctags'
+    elseif has('macunix') && executable('/opt/local/bin/ctags')
+        " Macports default location
+        let g:tagbar_ctags_bin = '/opt/local/bin/ctags'
     elseif executable('ctags')
         let g:tagbar_ctags_bin = 'ctags'
     elseif executable('ctags.exe')
@@ -49,7 +48,14 @@ if !exists('g:tagbar_ctags_bin')
         finish
     endif
 else
+    " reset 'wildignore' temporarily in case *.exe is included in it
+    let wildignore_save = &wildignore
+    set wildignore&
+
     let g:tagbar_ctags_bin = expand(g:tagbar_ctags_bin)
+
+    let &wildignore = wildignore_save
+
     if !executable(g:tagbar_ctags_bin)
         echomsg 'Tagbar: Exuberant ctags not found in specified place,'
               \ 'skipping plugin'
@@ -67,52 +73,6 @@ if s:ftype_out !~# 'detection:ON'
 endif
 unlet s:ftype_out
 
-let g:loaded_tagbar = 1
-
-if !exists('g:tagbar_left')
-    let g:tagbar_left = 0
-endif
-
-if !exists('g:tagbar_width')
-    let g:tagbar_width = 40
-endif
-
-if !exists('g:tagbar_autoclose')
-    let g:tagbar_autoclose = 0
-endif
-
-if !exists('g:tagbar_autofocus')
-    let g:tagbar_autofocus = 0
-endif
-
-if !exists('g:tagbar_sort')
-    let g:tagbar_sort = 1
-endif
-
-if !exists('g:tagbar_compact')
-    let g:tagbar_compact = 0
-endif
-
-if !exists('g:tagbar_expand')
-    let g:tagbar_expand = 0
-endif
-
-if !exists('g:tagbar_foldlevel')
-    let g:tagbar_foldlevel = 99
-endif
-
-if !exists('g:tagbar_usearrows')
-    let g:tagbar_usearrows = 0
-endif
-
-if !exists('g:tagbar_autoshowtag')
-    let g:tagbar_autoshowtag = 0
-endif
-
-if !exists('g:tagbar_systemenc')
-    let g:tagbar_systemenc = &encoding
-endif
-
 if has('multi_byte') && has('unix') && &encoding == 'utf-8' &&
  \ (empty(&termencoding) || &termencoding == 'utf-8')
     let s:icon_closed = '▶'
@@ -136,7 +96,9 @@ let s:access_symbols = {
     \ 'private'   : '-'
 \ }
 
-autocmd SessionLoadPost * nested call s:RestoreSession()
+let g:loaded_tagbar = 1
+
+let s:last_highlight_tline = 0
 
 " s:InitTypes() {{{2
 function! s:InitTypes()
@@ -861,22 +823,28 @@ function! s:RestoreSession()
     call s:InitWindow(g:tagbar_autoclose)
 
     " Leave the Tagbar window and come back so the update event gets triggered
-    execute 'wincmd p'
+    wincmd p
     execute tagbarwinnr . 'wincmd w'
 
     if !in_tagbar
-        execute 'wincmd p'
+        wincmd p
     endif
 endfunction
 
 " s:MapKeys() {{{2
 function! s:MapKeys()
-    nnoremap <script> <silent> <buffer> <CR>    :call <SID>JumpToTag(0)<CR>
     nnoremap <script> <silent> <buffer> <2-LeftMouse>
                                               \ :call <SID>JumpToTag(0)<CR>
-    nnoremap <script> <silent> <buffer> p       :call <SID>JumpToTag(1)<CR>
     nnoremap <script> <silent> <buffer> <LeftRelease>
-                \ <LeftRelease>:call <SID>CheckMouseClick()<CR>
+                                 \ <LeftRelease>:call <SID>CheckMouseClick()<CR>
+
+    inoremap <script> <silent> <buffer> <2-LeftMouse>
+                                              \ <C-o>:call <SID>JumpToTag(0)<CR>
+    inoremap <script> <silent> <buffer> <LeftRelease>
+                            \ <LeftRelease><C-o>:call <SID>CheckMouseClick()<CR>
+
+    nnoremap <script> <silent> <buffer> <CR>    :call <SID>JumpToTag(0)<CR>
+    nnoremap <script> <silent> <buffer> p       :call <SID>JumpToTag(1)<CR>
     nnoremap <script> <silent> <buffer> <Space> :call <SID>ShowPrototype()<CR>
 
     nnoremap <script> <silent> <buffer> +        :call <SID>OpenFold()<CR>
@@ -914,7 +882,11 @@ function! s:CreateAutocommands()
         autocmd BufUnload  __Tagbar__ call s:CleanUp()
         autocmd CursorHold __Tagbar__ call s:ShowPrototype()
 
-        autocmd BufEnter,CursorHold * call
+        autocmd BufWritePost *
+            \ if line('$') < g:tagbar_updateonsave_maxlines |
+                \ call s:AutoUpdate(fnamemodify(expand('<afile>'), ':p')) |
+            \ endif
+        autocmd BufEnter,CursorHold,FileType * call
                     \ s:AutoUpdate(fnamemodify(expand('<afile>'), ':p'))
         autocmd BufDelete * call
                     \ s:CleanupFileinfo(fnamemodify(expand('<afile>'), ':p'))
@@ -968,6 +940,10 @@ endfunction
 
 " s:CheckExCtagsVersion() {{{2
 function! s:CheckExCtagsVersion(output)
+    if a:output =~ 'Exuberant Ctags Development'
+        return 1
+    endif
+
     let matchlist = matchlist(a:output, '\vExuberant Ctags (\d+)\.(\d+)')
     let major     = matchlist[1]
     let minor     = matchlist[2]
@@ -1097,6 +1073,7 @@ function! s:BaseTag.closeFold() dict
     elseif self.isFoldable() && !self.isFolded()
         " Tag is parent of a scope and is not folded
         let self.fileinfo.tagfolds[self.fields.kind][self.fullpath] = 1
+        let newline = self.tline
     elseif !empty(self.parent)
         " Tag is normal child, so close parent
         let parent = self.parent
@@ -1396,12 +1373,20 @@ function! s:ToggleWindow()
 endfunction
 
 " s:OpenWindow() {{{2
-function! s:OpenWindow(autoclose)
-    " If the tagbar window is already open jump to it
+function! s:OpenWindow(flags)
+    let autofocus = a:flags =~# 'f'
+    let jump      = a:flags =~# 'j'
+    let autoclose = a:flags =~# 'c'
+
+    " If the tagbar window is already open check jump flag
+    " Also set the autoclose flag if requested
     let tagbarwinnr = bufwinnr('__Tagbar__')
     if tagbarwinnr != -1
-        if winnr() != tagbarwinnr
+        if winnr() != tagbarwinnr && jump
             execute tagbarwinnr . 'wincmd w'
+            if autoclose
+                let w:autoclose = autoclose
+            endif
         endif
         return
     endif
@@ -1422,16 +1407,21 @@ function! s:OpenWindow(autoclose)
         let s:window_expanded = 1
     endif
 
+    let eventignore_save = &eventignore
+    set eventignore=all
+
     let openpos = g:tagbar_left ? 'topleft vertical ' : 'botright vertical '
     exe 'silent keepalt ' . openpos . g:tagbar_width . 'split ' . '__Tagbar__'
 
-    call s:InitWindow(a:autoclose)
+    let &eventignore = eventignore_save
 
-    execute 'wincmd p'
+    call s:InitWindow(autoclose)
+
+    wincmd p
 
     " Jump back to the tagbar window if autoclose or autofocus is set. Can't
     " just stay in it since it wouldn't trigger the update event
-    if g:tagbar_autoclose || a:autoclose || g:tagbar_autofocus
+    if g:tagbar_autoclose || autofocus || g:tagbar_autofocus
         let tagbarwinnr = bufwinnr('__Tagbar__')
         execute tagbarwinnr . 'wincmd w'
     endif
@@ -1451,19 +1441,27 @@ function! s:InitWindow(autoclose)
     setlocal nowrap
     setlocal winfixwidth
     setlocal textwidth=0
+    setlocal nocursorline
+    setlocal nocursorcolumn
 
     if exists('+relativenumber')
         setlocal norelativenumber
     endif
 
     setlocal nofoldenable
+    setlocal foldcolumn=0
     " Reset fold settings in case a plugin set them globally to something
     " expensive. Apparently 'foldexpr' gets executed even if 'foldenable' is
     " off, and then for every appended line (like with :put).
     setlocal foldmethod&
     setlocal foldexpr&
 
-    setlocal statusline=%!TagbarGenerateStatusline()
+    " Earlier versions have a bug in local, evaluated statuslines
+    if v:version > 701 || (v:version == 701 && has('patch097'))
+        setlocal statusline=%!TagbarGenerateStatusline()
+    else
+        setlocal statusline=Tagbar
+    endif
 
     " Script-local variable needed since compare functions can't
     " take extra arguments
@@ -1506,6 +1504,7 @@ function! s:CloseWindow()
         if winbufnr(2) != -1
             " Other windows are open, only close the tagbar one
             close
+            wincmd p
         endif
     else
         " Go to the tagbar window, close it and then come back to the
@@ -1671,7 +1670,11 @@ function! s:ExecuteCtagsOnFile(fname, ftype)
     endif
 
     if has_key(typeinfo, 'ctagsbin')
+        " reset 'wildignore' temporarily in case *.exe is included in it
+        let wildignore_save = &wildignore
+        set wildignore&
         let ctags_bin = expand(typeinfo.ctagsbin)
+        let &wildignore = wildignore_save
     else
         let ctags_bin = g:tagbar_ctags_bin
     endif
@@ -1721,7 +1724,7 @@ function! s:ParseTagline(part1, part2, typeinfo, fileinfo)
         let dollar = ''
     endif
     let pattern           = strpart(pattern, start, end - start)
-    let taginfo.pattern   = '\V\^' . pattern . dollar
+    let taginfo.pattern   = '\V\^\C' . pattern . dollar
     let prototype         = substitute(pattern,   '^[[:space:]]\+', '', '')
     let prototype         = substitute(prototype, '[[:space:]]\+$', '', '')
     let taginfo.prototype = prototype
@@ -1758,7 +1761,13 @@ function! s:ParseTagline(part1, part2, typeinfo, fileinfo)
     let taginfo.fileinfo = a:fileinfo
 
     " Needed for folding
-    call taginfo.initFoldState()
+    try
+        call taginfo.initFoldState()
+    catch /^Vim(\a\+):E716:/ " 'Key not present in Dictionary'
+        " The tag has a 'kind' that doesn't exist in the type definition
+        echoerr 'Your ctags and Tagbar configurations are out of sync!'
+              \ 'Please read '':help tagbar-extend''.'
+    endtry
 
     return taginfo
 endfunction
@@ -2067,7 +2076,7 @@ function! s:RenderContent(...)
     " Delete empty lines at the end of the buffer
     for linenr in range(line('$'), 1, -1)
         if getline(linenr) =~ '^$'
-            execute linenr . 'delete _'
+            execute 'silent ' . linenr . 'delete _'
         else
             break
         endif
@@ -2090,6 +2099,9 @@ function! s:RenderContent(...)
         " window by jumping to the top after drawing
         execute 1
         call winline()
+
+        " Invalidate highlight cache from old file
+        let s:last_highlight_tline = 0
     endif
 
     let &lazyredraw  = lazyredraw_save
@@ -2128,9 +2140,22 @@ function! s:PrintKinds(typeinfo, fileinfo)
                 let tag.tline                 = curline
                 let a:fileinfo.tline[curline] = tag
 
+                " Print children
                 if tag.isFoldable() && !tag.isFolded()
-                    for childtag in tag.children
-                        call s:PrintTag(childtag, 1, a:fileinfo, a:typeinfo)
+                    for ckind in a:typeinfo.kinds
+                        let childtags = filter(copy(tag.children),
+                                          \ 'v:val.fields.kind ==# ckind.short')
+                        if len(childtags) > 0
+                            " Print 'kind' header of following children
+                            if !has_key(a:typeinfo.kind2scope, ckind.short)
+                                silent put ='    [' . ckind.long . ']'
+                                let a:fileinfo.tline[line('.')] = tag
+                            endif
+                            for childtag in childtags
+                                call s:PrintTag(childtag, 1,
+                                              \ a:fileinfo, a:typeinfo)
+                            endfor
+                        endif
                     endfor
                 endif
 
@@ -2196,8 +2221,21 @@ function! s:PrintTag(tag, depth, fileinfo, typeinfo)
 
     " Recursively print children
     if a:tag.isFoldable() && !a:tag.isFolded()
-        for childtag in a:tag.children
-            call s:PrintTag(childtag, a:depth + 1, a:fileinfo, a:typeinfo)
+        for ckind in a:typeinfo.kinds
+            let childtags = filter(copy(a:tag.children),
+                                 \ 'v:val.fields.kind ==# ckind.short')
+            if len(childtags) > 0
+                " Print 'kind' header of following children
+                if !has_key(a:typeinfo.kind2scope, ckind.short)
+                    silent put ='    ' . repeat(' ', a:depth * 2) .
+                              \ '[' . ckind.long . ']'
+                    let a:fileinfo.tline[line('.')] = a:tag
+                endif
+                for childtag in childtags
+                    call s:PrintTag(childtag, a:depth + 1,
+                                  \ a:fileinfo, a:typeinfo)
+                endfor
+            endif
         endfor
     endif
 endfunction
@@ -2266,6 +2304,15 @@ function! s:HighlightTag()
         let tagline = tag.tline
     endif
 
+    " Don't highlight the tag again if it's the same one as last time.
+    " This prevents the Tagbar window from jumping back after scrolling with
+    " the mouse.
+    if tagline == s:last_highlight_tline
+        return
+    else
+        let s:last_highlight_tline = tagline
+    endif
+
     let eventignore_save = &eventignore
     set eventignore=all
 
@@ -2320,10 +2367,13 @@ function! s:JumpToTag(stay_in_tagbar)
 
     let tagbarwinnr = winnr()
 
+    let eventignore_save = &eventignore
+    set eventignore=all
+
     " This elaborate construct will try to switch to the correct
     " buffer/window; if the buffer isn't currently shown in a window it will
     " open it in the first window with a non-special buffer in it
-    execute 'wincmd p'
+    wincmd p
     let filebufnr = bufnr(taginfo.fileinfo.fpath)
     if bufnr('%') != filebufnr
         let filewinnr = bufwinnr(filebufnr)
@@ -2341,7 +2391,7 @@ function! s:JumpToTag(stay_in_tagbar)
         " To make ctrl-w_p work we switch between the Tagbar window and the
         " correct window once
         execute tagbarwinnr . 'wincmd w'
-        execute 'wincmd p'
+        wincmd p
     endif
 
     " Mark current position so it can be jumped back to
@@ -2352,6 +2402,31 @@ function! s:JumpToTag(stay_in_tagbar)
     " with the same name are defined in different scopes (e.g. classes)
     execute taginfo.fields.line
 
+    " If the file has been changed but not saved, the tag may not be on the
+    " saved line anymore, so search for it in the vicinity of the saved line
+    if match(getline('.'), taginfo.pattern) == -1
+        let interval = 1
+        let forward  = 1
+        while search(taginfo.pattern, 'W' . forward ? '' : 'b') == 0
+            if !forward
+                if interval > line('$')
+                    break
+                else
+                    let interval = interval * 2
+                endif
+            endif
+            let forward = !forward
+        endwhile
+    endif
+
+    " If the tag is on a different line after unsaved changes update the tag
+    " and file infos/objects
+    let curline = line('.')
+    if taginfo.fields.line != curline
+        let taginfo.fields.line = curline
+        let taginfo.fileinfo.fline[curline] = taginfo
+    endif
+
     " Center the tag in the window
     normal! z.
 
@@ -2361,6 +2436,8 @@ function! s:JumpToTag(stay_in_tagbar)
 
     redraw
 
+    let &eventignore = eventignore_save
+
     if a:stay_in_tagbar
         call s:HighlightTag()
         execute tagbarwinnr . 'wincmd w'
@@ -2788,6 +2865,8 @@ function! s:CheckMouseClick()
         call s:CloseFold()
     elseif (match(line, s:icon_closed . '[-+ ]') + 1) == curcol
         call s:OpenFold()
+    elseif g:tagbar_singleclick
+        call s:JumpToTag(0)
     endif
 endfunction
 
@@ -2818,13 +2897,31 @@ function! TagbarGenerateStatusline()
     return text
 endfunction
 
-" Commands {{{1
-command! -nargs=0 TagbarToggle        call s:ToggleWindow()
-command! -nargs=0 TagbarOpen          call s:OpenWindow(0)
-command! -nargs=0 TagbarOpenAutoClose call s:OpenWindow(1)
-command! -nargs=0 TagbarClose         call s:CloseWindow()
-command! -nargs=1 TagbarSetFoldlevel  call s:SetFoldLevel(<args>)
-command! -nargs=0 TagbarShowTag       call s:OpenParents()
+" Autoload functions {{{1
+function! tagbar#ToggleWindow()
+    call s:ToggleWindow()
+endfunction
+
+function! tagbar#OpenWindow(...)
+    let flags = a:0 > 0 ? a:1 : ''
+    call s:OpenWindow(flags)
+endfunction
+
+function! tagbar#CloseWindow()
+    call s:CloseWindow()
+endfunction
+
+function! tagbar#SetFoldLevel(...)
+    call s:SetFoldLevel(a:1)
+endfunction
+
+function! tagbar#OpenParents()
+    call s:OpenParents()
+endfunction
+
+function! tagbar#RestoreSession()
+    call s:RestoreSession()
+endfunction
 
 " Modeline {{{1
 " vim: ts=8 sw=4 sts=4 et foldenable foldmethod=marker foldcolumn=1
diff --git a/doc/tagbar.txt b/doc/tagbar.txt
index ffa58fa..92d9d4a 100644
--- a/doc/tagbar.txt
+++ b/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.1
+Version:	2.2
 
 ==============================================================================
 Contents					*tagbar* *tagbar-contents*
@@ -21,7 +21,7 @@ Contents					*tagbar* *tagbar-contents*
 	      Highlight colours ............. |tagbar-highlight|
 	      Automatically opening Tagbar .. |tagbar-autoopen|
 	 6. Extending Tagbar ................ |tagbar-extend|
-	 7. Bugs and limitations ............ |tagbar-bugs|
+	 7. Troubleshooting & Known issues .. |tagbar-issues|
 	 8. History ......................... |tagbar-history|
 	 9. Todo ............................ |tagbar-todo|
 	10. Credits ......................... |tagbar-credits|
@@ -113,11 +113,7 @@ 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: 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
-moment (especially regarding line numbers), so if you notice some strange
-behaviour with it please run it manually in a terminal to check whether the
-bug is in jsctags or Tagbar.
+Note: Please check |tagbar-issues| for some possible issues with jsctags.
 
 ==============================================================================
 2. Requirements						*tagbar-requirements*
@@ -229,9 +225,22 @@ displayed when the cursor stays on a tag for 'updatetime' milliseconds.
 ------------------------------------------------------------------------------
 COMMANDS						*tagbar-commands*
 
-:TagbarOpen
-    Open the Tagbar if it is closed. In case it is already open jump to it.
+:TagbarOpen [{flags}]
+    Open the Tagbar window if it is closed.
 
+    Additional behaviour can be specified with the optional {flags} argument.
+    It is a string which can contain these character flags:
+    'f'   Jump to Tagbar window when opening (just as if |g:tagbar_autofocus|
+          were set to 1)
+    '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')
+
+    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
+    (unless |g:tagbar_autoclose| is set): >
+        :TagbarOpen fj
+<
 :TagbarClose
     Close the Tagbar window if it is open.
 
@@ -239,11 +248,11 @@ COMMANDS						*tagbar-commands*
     Open the Tagbar window if it is closed or close it if it is open.
 
 :TagbarOpenAutoClose
-    Open the Tagbar window and close it on tag selection, regardless of the
-    setting of |g:tagbar_autoclose|. If it was already open jump to it.
+    Open the Tagbar window, jump to it and close it on tag selection. This is
+    an alias for ":TagbarOpen fc".
 
-:TagbarSetFoldlevel [number]
-    Set the foldlevel of the tags of the current file to [number]. The
+:TagbarSetFoldlevel {number}
+    Set the foldlevel of the tags of the current file to {number}. The
     foldlevel of tags in other files remains unaffected. Works in the same way
     as 'foldlevel'.
 
@@ -254,7 +263,7 @@ COMMANDS						*tagbar-commands*
 ------------------------------------------------------------------------------
 KEY MAPPINGS						*tagbar-keys*
 
-These mappings are valid in the Tagbar window:
+The following mappings are valid in the Tagbar window:
 
 <F1>          Display key mapping help.
 <CR>/<Enter>  Jump to the tag under the cursor. Doesn't work for pseudo-tags
@@ -262,7 +271,8 @@ These mappings are valid in the Tagbar window:
 p             Jump to the tag under the cursor, but stay in the Tagbar window.
 <LeftMouse>   When on a fold icon, open or close the fold depending on the
               current state.
-<2-LeftMouse> Same as <CR>.
+<2-LeftMouse> Same as <CR>. See |g:tagbar_singleclick| if you want to use a
+              single- instead of a double-click.
 <Space>       Display the prototype of the current tag (i.e. the line defining
               it) in the command line.
 +/zo          Open the fold under the cursor.
@@ -321,7 +331,7 @@ g:tagbar_autoclose~
 Default: 0
 
 If you set this option the Tagbar window will automatically close when you
-jump to a tag.
+jump to a tag. This implies |g:tagbar_autofocus|.
 
 Example:
 >
@@ -379,6 +389,18 @@ Example:
 	let g:tagbar_expand = 1
 <
 
+							*g:tagbar_singleclick*
+g:tagbar_singleclick~
+Default: 0
+
+If this option is set then a single- instead of a double-click is used to jump
+to the tag definition.
+
+Example:
+>
+	let g:tagbar_singleclick = 1
+<
+
 							*g:tagbar_foldlevel*
 g:tagbar_foldlevel~
 Default: 99
@@ -423,6 +445,22 @@ Example:
 	let g:tagbar_autoshowtag = 1
 <
 
+						*g:tagbar_updateonsave_maxlines*
+g:tagbar_updateonsave_maxlines~
+Default: 5000
+
+If the current file has fewer lines than the value of this variable, Tagbar
+will update immediately after saving the file. If it is longer then the update
+will only happen on the |CursorHold| event and when switching buffers (or
+windows). This is to prevent the time it takes to save a large file from
+becoming annoying in case you have a slow computer. If you have a fast
+computer you can set it to a higher value.
+
+Example:
+>
+	let g:tagbar_updateonsave_maxlines = 10000
+<
+
 							*g:tagbar_systemenc*
 g:tagbar_systemenc~
 Default: value of 'encoding'
@@ -450,6 +488,9 @@ TagbarComment
 TagbarKind
     The header of generic "kinds" like "functions" and "variables".
 
+TagbarNestedKind
+    The "kind" headers in square brackets inside of scopes.
+
 TagbarScope
     Tags that define a scope like classes, structs etc.
 
@@ -511,6 +552,16 @@ existing types and to add completely new types. A complete configuration
 consists of a type definition for Tagbar in your |vimrc| and optionally a
 language definition for ctags in case you want to add a new language.
 
+Before writing your own extension try googling for already existing ones. For
+example, here is one for Scala:
+http://latestbuild.net/scala-ctags-and-vim-tagbar
+Since those aren't "canonical" configurations and are somewhat subjective they
+probably won't be included in Tagbar, but it is easy enough to just copy&paste
+them into your own setup. Note that you don't have to modify Tagbar directly
+like the article suggests, you can just put the configuration into your
+|vimrc| (see below for more details).
+
+
 Every type definition in Tagbar is a dictionary with the following keys:
 
 ctagstype:  The name of the language as recognized by ctags. Use the command >
@@ -535,7 +586,7 @@ kinds:      A list of the "language kinds" that should be listed in Tagbar,
 <           would list all the function definitions in a file under the header
             "functions" and fold them.
 sro:        The scope resolution operator. For example, in C++ it is "::" and
-            in Java it is ".". If in doubt run ctags as shown above and check
+            in Java it is ".". If in doubt run ctags as shown below and check
             the output.
 kind2scope: A dictionary describing the mapping of tag kinds (in their
             one-character representation) to the scopes their children will
@@ -552,8 +603,8 @@ kind2scope: A dictionary describing the mapping of tag kinds (in their
                 private:
                     int var;
                 };
-<           We then run ctags in the followin way: >
-                ctags -f - --format=2 --excmd=pattern --fields=nksazSmt --extra= test.cpp
+<           We then run ctags in the following way: >
+                ctags -f - --format=2 --excmd=pattern --extra= --fields=nksaSmt test.cpp
 <           Then the output for the variable "var" would look like this: >
                 var	tmp.cpp /^    int var;$/;"	kind:m	line:11	class:Foo	access:private
 <           This shows that the scope name for an entry in a C++ class is
@@ -614,7 +665,8 @@ and vim will display the file type of the current buffer.
 
 Example: C++~
 Here is a complete example that shows the default configuration for C++ as
-used in Tagbar.
+used in Tagbar. This is just for illustration purposes since user
+configurations will usually be less complicated.
 >
 	let g:tagbar_type_cpp = {
 	    \ 'ctagstype' : 'c++',
@@ -676,7 +728,7 @@ the order of enums and typedefs, you would do it like this:
 	    \ ]
 	\ }
 <
-Compare with the complete example above to see the exact change.
+Compare with the complete example above to see the difference.
 
 Adding a definition for a new language/file type~
 In order to be able to add a new language to Tagbar you first have to create a
@@ -756,14 +808,32 @@ Tagbar should now be able to show the sections and other tags from LaTeX
 files.
 
 ==============================================================================
-7. Bugs and limitations					*tagbar-bugs*
+7. Troubleshooting & Known issues			*tagbar-issues*
+
+As a general rule, if the tag information displayed by Tagbar is wrong (for
+example, a method doesn't show up or is in the wrong place) you should first
+try running ctags manually to see whether ctags reports the wrong information
+or whether that information is correct and Tagbar does something wrong. To run
+ctags manually execute the following command in a terminal:
+>
+	ctags -f - --format=2 --excmd=pattern --extra= --fields=nksaSmt myfile
+<
+If you set the |g:tagbar_ctags_bin| variable you probably have to use the same
+value here instead of simply "ctags".
+
+
+  - 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
+    moment (especially regarding line numbers), so if you notice some strange
+    behaviour with it please run it manually in a terminal to check whether
+    the bug is in jsctags or Tagbar.
 
   - Nested pseudo-tags cannot be properly parsed since only the direct parent
     scope of a tag gets assigned a type, the type of the grandparents is not
     reported by ctags (assuming the grandparents don't have direct, real
     children).
 
-    For example, if we have a C++ with the following content:
+    For example, if we have a C++ file with the following content:
 >
         foo::Bar::init()
         {
@@ -804,6 +874,23 @@ files.
 ==============================================================================
 8. History						*tagbar-history*
 
+2.2 (2011-11-26)
+    - Small incompatible change: TagbarOpen now doesn't jump to the Tagbar
+      window anymore if it is already open. Use "TagbarOpen j" instead or see
+      its documentation for more options.
+    - Tags inside of scopes now have a header displaying their "kind".
+    - The Tagbar contents are now immediately updated on save for files
+      smaller than a configurable size.
+    - Tagbar can now be configured to jump to a tag with only a single-click
+      instead of a double-click.
+    - Most of the script has been moved to the |autoload| directory, so Vim
+      startup should be faster (thanks to Kien N).
+    - Jumping to tags should work most of the time even if the file has been
+      modified and not saved.
+    - If Ctags has been installed into the default location using Homebrew or
+      MacPorts it should now be found automatically.
+    - Several bugfixes.
+
 2.1 (2011-05-29)
     - Make Tagbar work in (hopefully) all cases under Windows
     - Handle cases where 'encoding' is different from system encoding, for
@@ -883,13 +970,13 @@ software.
 
 The folding technique was inspired by NERDTree by Martin Grenfell.
 
-Taybin Rutkin:
-  - Contributed tagbar_autofocus option
-Seth Milliken:
-  - Contributed folding keybindings that resemble the built-in ones
-
-Thanks to the following people for feature suggestions etc: Jan Christoph
-Ebersbach, pielgrzym
+Thanks to the following people for code contributions, feature suggestions etc:
+Jan Christoph Ebersbach
+Leandro Freitas
+Seth Milliken
+Kien N
+pielgrzym
+Taybin Rutkin
 
 ==============================================================================
  vim: tw=78 ts=8 sw=8 sts=8 noet ft=help
diff --git a/doc/tags b/doc/tags
index b0fc2a7..58587b6 100644
--- a/doc/tags
+++ b/doc/tags
@@ -413,8 +413,10 @@ g:tagbar_ctags_bin	tagbar.txt	/*g:tagbar_ctags_bin*
 g:tagbar_expand	tagbar.txt	/*g:tagbar_expand*
 g:tagbar_foldlevel	tagbar.txt	/*g:tagbar_foldlevel*
 g:tagbar_left	tagbar.txt	/*g:tagbar_left*
+g:tagbar_singleclick	tagbar.txt	/*g:tagbar_singleclick*
 g:tagbar_sort	tagbar.txt	/*g:tagbar_sort*
 g:tagbar_systemenc	tagbar.txt	/*g:tagbar_systemenc*
+g:tagbar_updateonsave_maxlines	tagbar.txt	/*g:tagbar_updateonsave_maxlines*
 g:tagbar_usearrows	tagbar.txt	/*g:tagbar_usearrows*
 g:tagbar_width	tagbar.txt	/*g:tagbar_width*
 g:vimwiki_CJK_length	vimwiki.txt	/*g:vimwiki_CJK_length*
@@ -921,7 +923,6 @@ surround-targets	surround.txt	/*surround-targets*
 surround.txt	surround.txt	/*surround.txt*
 tagbar	tagbar.txt	/*tagbar*
 tagbar-autoopen	tagbar.txt	/*tagbar-autoopen*
-tagbar-bugs	tagbar.txt	/*tagbar-bugs*
 tagbar-commands	tagbar.txt	/*tagbar-commands*
 tagbar-configuration	tagbar.txt	/*tagbar-configuration*
 tagbar-contents	tagbar.txt	/*tagbar-contents*
@@ -932,6 +933,7 @@ tagbar-highlight	tagbar.txt	/*tagbar-highlight*
 tagbar-history	tagbar.txt	/*tagbar-history*
 tagbar-installation	tagbar.txt	/*tagbar-installation*
 tagbar-intro	tagbar.txt	/*tagbar-intro*
+tagbar-issues	tagbar.txt	/*tagbar-issues*
 tagbar-keys	tagbar.txt	/*tagbar-keys*
 tagbar-other	tagbar.txt	/*tagbar-other*
 tagbar-pseudotags	tagbar.txt	/*tagbar-pseudotags*
diff --git a/plugin/calendar.vim b/plugin/calendar.vim
new file mode 100644
index 0000000..598dd3a
--- /dev/null
+++ b/plugin/calendar.vim
@@ -0,0 +1,1328 @@
+"=============================================================================
+" What Is This: Calendar
+" File: calendar.vim
+" Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
+" Last Change: 27-Jan-2011.
+" Version: 2.5
+" Thanks:
+"     SethMilliken                  : gave a hint for 2.4
+"     bw1                           : bug fix
+"     Ingo Karkat                   : bug fix
+"     Thinca                        : bug report, bug fix
+"     Yu Pei                        : bug report
+"     Per Winkvist                  : bug fix
+"     Serge (gentoosiast) Koksharov : bug fix
+"     Vitor Antunes                 : bug fix
+"     Olivier Mengue                : bug fix
+"     Noel Henson                   : today action
+"     Per Winkvist                  : bug report
+"     Peter Findeisen               : bug fix
+"     Chip Campbell                 : gave a hint for 1.3z
+"     PAN Shizhu                    : gave a hint for 1.3y
+"     Eric Wald                     : bug fix
+"     Sascha Wuestemann             : advise
+"     Linas Vasiliauskas            : bug report
+"     Per Winkvist                  : bug report
+"     Ronald Hoelwarth              : gave a hint for 1.3s
+"     Vikas Agnihotri               : bug report
+"     Steve Hall                    : gave a hint for 1.3q
+"     James Devenish                : bug fix
+"     Carl Mueller                  : gave a hint for 1.3o
+"     Klaus Fabritius               : bug fix
+"     Stucki                        : gave a hint for 1.3m
+"     Rosta                         : bug report
+"     Richard Bair                  : bug report
+"     Yin Hao Liew                  : bug report
+"     Bill McCarthy                 : bug fix and gave a hint
+"     Srinath Avadhanula            : bug fix
+"     Ronald Hoellwarth             : few advices
+"     Juan Orlandini                : added higlighting of days with data
+"     Ray                           : bug fix
+"     Ralf.Schandl                  : gave a hint for 1.3
+"     Bhaskar Karambelkar           : bug fix
+"     Suresh Govindachar            : gave a hint for 1.2, bug fix
+"     Michael Geddes                : bug fix
+"     Leif Wickland                 : bug fix
+" Usage:
+"     :Calendar
+"       show calendar at this year and this month
+"     :Calendar 8
+"       show calendar at this year and given month
+"     :Calendar 2001 8
+"       show calendar at given year and given month
+"     :CalendarH ...
+"       show horizontal calendar ...
+"
+"     <Leader>cal
+"       show calendar in normal mode
+"     <Leader>caL
+"       show horizontal calendar ...
+" ChangeLog:
+"     2.5  : bug fix, 7.2 don't have relativenumber.
+"     2.4  : added g:calendar_options.
+"     2.3  : week number like ISO8601 
+"            g:calendar_monday and g:calendar_weeknm work together
+"     2.2  : http://gist.github.com/355513#file_customizable_keymap.diff
+"            http://gist.github.com/355513#file_winfixwidth.diff
+"     2.1  : bug fix, set filetype 'calendar'.
+"     2.0  : bug fix, many bug fix and enhancements.
+"     1.9  : bug fix, use nnoremap.
+"     1.8  : bug fix, E382 when close diary.
+"     1.7  : bug fix, week number was broken on 2008.
+"     1.6  : added calendar_begin action.
+"            added calendar_end action.
+"     1.5  : bug fix, fixed ruler formating with strpart.
+"            bug fix, using winfixheight.
+"     1.4a : bug fix, week number was broken on 2005.
+"            added calendar_today action.
+"            bug fix, about wrapscan.
+"            bug fix, about today mark.
+"            bug fix, about today navigation.
+"     1.4  : bug fix, and one improvement.
+"            bug 1:
+"              when marking the current date, there is not distinguished e.g. between
+"              20041103 and 20040113, both dates are marked as today
+"            bug 2:
+"              the navigation mark "today" doesn't work
+"            improvement:
+"              the mapping t worked only when today was displayed, now it works always
+"              and redisplays the cuurent month and today
+"     1.3z : few changes
+"            asign <Left>, <Right> for navigation.
+"            set ws for search navigation.
+"            add tag for GetLatestVimScripts(AutoInstall)
+"     1.3y : bug fix, few changes
+"            changed color syntax name. (ex. CalNavi, see bottom of this)
+"            changed a map CalendarV for <Leader>cal
+"            changed a map CalendarH for <Leader>caL
+"            (competitive map for cvscommand.vim)
+"            the date on the right-hand side didn't work correctoly.
+"            make a map to rebuild Calendar window(r).
+"     1.3x : bug fix
+"            viweek can't refer when not set calendar_weeknm.
+"     1.3w : bug fix
+"            on leap year, week number decreases.
+"     1.3v : bug fix
+"            add nowrapscan 
+"            use s:bufautocommandsset for making title
+"            don't focus to navi when doubleclick bottom next>.
+"     1.3u : bug fix
+"             when enter diary first time,
+"              it don't warn that you don't have diary directory.
+"     1.3t : bug fix
+"             make sure the variables for help
+"     1.3s : bug fix
+"             make a map CalendarV for <Leader>ca
+"            add option calendar_navi_label
+"             see Additional:
+"            add option calendar_focus_today
+"             see Additional:
+"            add map ? for help
+"     1.3r : bug fix
+"             if clicked navigator, cursor go to strange position.
+"     1.3q : bug fix
+"             coundn't set calendar_navi
+"              in its horizontal direction
+"     1.3p : bug fix
+"             coundn't edit diary when the calendar is
+"              in its horizontal direction
+"     1.3o : add option calendar_mark, and delete calendar_rmark
+"             see Additional:
+"            add option calendar_navi
+"             see Additional:
+"     1.3n : bug fix
+"             s:CalendarSign() should use filereadable(expand(sfile)).
+"     1.3m : tuning
+"             using topleft or botright for opening Calendar.
+"            use filereadable for s:CalendarSign().
+"     1.3l : bug fix
+"             if set calendar_monday, it can see that Sep 1st is Sat
+"               as well as Aug 31st.
+"     1.3k : bug fix
+"             it didn't escape the file name on calendar.
+"     1.3j : support for fixed Gregorian
+"             added the part of Sep 1752.
+"     1.3i : bug fix
+"             Calculation mistake for week number.
+"     1.3h : add option for position of displaying '*' or '+'.
+"             see Additional:
+"     1.3g : centering header
+"            add option for show name of era.
+"             see Additional:
+"            bug fix
+"             <Leader>ca didn't show current month.
+"     1.3f : bug fix
+"            there was yet another bug of today's sign.
+"     1.3e : added usage for <Leader>
+"            support handler for sign.
+"            see Additional:
+"     1.3d : added higlighting of days that have calendar data associated
+"             with it.
+"            bug fix for calculates date.
+"     1.3c : bug fix for MakeDir()
+"            if CalendarMakeDir(sfile) != 0
+"               v 
+"            if s:CalendarMakeDir(sfile) != 0
+"     1.3b : bug fix for calendar_monday.
+"            it didn't work g:calendar_monday correctly.
+"            add g:calendar_version.
+"            add argument on action handler.
+"            see Additional:
+"     1.3a : bug fix for MakeDir().
+"            it was not able to make directory.
+"     1.3  : support handler for action.
+"            see Additional:
+"     1.2g : bug fix for today's sign.
+"            it could not display today's sign correctly.
+"     1.2f : bug fix for current Date.
+"            vtoday variable calculates date as 'YYYYMMDD'
+"            while the loop calculates date as 'YYYYMMD' i.e just 1 digit
+"            for date if < 10 so if current date is < 10 , the if condiction
+"            to check for current date fails and current date is not
+"            highlighted.
+"            simple solution changed vtoday calculation line divide the
+"            current-date by 1 so as to get 1 digit date.
+"     1.2e : change the way for setting title.
+"            auto configuration for g:calendar_wruler with g:calendar_monday
+"     1.2d : add option for show week number.
+"              let g:calendar_weeknm = 1
+"            add separator if horizontal.
+"            change all option's name
+"              g:calendar_mnth -> g:calendar_mruler
+"              g:calendar_week -> g:calendar_wruler
+"              g:calendar_smnd -> g:calendar_monday
+"     1.2c : add option for that the week starts with monday.
+"              let g:calendar_smnd = 1
+"     1.2b : bug fix for modifiable.
+"            setlocal nomodifiable (was set)
+"     1.2a : add default options.
+"            nonumber,foldcolumn=0,nowrap... as making gap
+"     1.2  : support wide display.
+"            add a command CalendarH
+"            add map <s-left> <s-right>
+"     1.1c : extra.
+"            add a titlestring for today.
+"     1.1b : bug fix by Michael Geddes.
+"            it happend when do ':Calender' twice
+"     1.1a : fix misspell.
+"            Calender -> Calendar
+"     1.1  : bug fix.
+"            it"s about strftime("%m")
+"     1.0a : bug fix by Leif Wickland.
+"            it"s about strftime("%w")
+"     1.0  : first release.
+" TODO:
+"     add the option for diary which is separate or single file.
+" Additional:
+"     *if you want to keep focus when goto next or prev calendar,
+"       add the following to your .vimrc:
+"
+"       let g:calendar_focus_today = 1
+"
+"     *if you want to place the mark('*' or '+') after the day,
+"       add the following to your .vimrc:
+"
+"       let g:calendar_mark = 'right'
+"
+"       NOTE:you can set 'left', 'left-fit', 'right' for this option.
+"
+"     *if you want to use navigator,
+"       add the following to your .vimrc:
+"
+"       let g:calendar_navi = ''
+"
+"       NOTE:you can set 'top', 'bottom', 'both' for this option.
+"
+"     *if you want to replace navigator in your language,
+"       add the following to your .vimrc:
+"
+"       let g:calendar_navi_label = 'Prev,Today,Next'
+"
+"       NOTE:it must be separated with ','.
+"
+"     *if you want to replace calendar header,
+"       add the following in your favorite language to your .vimrc:
+"
+"       let g:calendar_erafmt = 'Heisei,-1988'   " for Japanese
+"       (name of era and diff with A.D.)
+"
+"     *if you want to replace calendar ruler,
+"       add the following in your favorite language to your .vimrc:
+"
+"       let g:calendar_mruler = 'Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec'
+"       let g:calendar_wruler = 'Su Mo Tu We Th Fr Sa'
+"
+"     *if you want the week to start with monday, add below to your .vimrc:
+"
+"       let g:calendar_monday = 1
+"       (You don't have to to change g:calendar_wruler!)
+"
+"     *if you want to show week number, add this to your .vimrc:
+"
+"       set g:calendar_weeknm as below
+"
+"       let g:calendar_weeknm = 1 " WK01
+"       let g:calendar_weeknm = 2 " WK 1
+"       let g:calendar_weeknm = 3 " KW01
+"       let g:calendar_weeknm = 4 " KW 1
+"
+"     *if you want to show the current date and time, add below to your .vimrc:
+"
+"       let g:calendar_datetime = 'title'
+"
+"       NOTE:you can set 'title', 'statusline', '' for this option.
+"
+"     *if you want to hook calender when pressing enter,
+"       add this to your .vimrc:
+"
+"       function MyCalAction(day,month,year,week,dir)
+"         " day   : day you actioned
+"         " month : month you actioned
+"         " year  : year you actioned
+"         " week  : day of week (Mo=1 ... Su=7)
+"         " dir   : direction of calendar
+"       endfunction
+"       let calendar_action = 'MyCalAction'
+"
+"       also, Calendar call following actions when begin or end of display.
+"       them actions are called at one each time when it show 3 months display.
+"
+"       function MyCalActionBegin()
+"       endfunction
+"       let calendar_begin = 'MyCalActionBegin'
+"
+"       function MyCalActionEnd()
+"       endfunction
+"       let calendar_end = 'MyCalActionEnd'
+"
+"     *if you want to show sign in calender,
+"       add this to your .vimrc:
+"
+"       function MyCalSign(day,month,year)
+"         " day   : day you actioned
+"         " month : month you actioned
+"         " year  : year you actioned
+"         if a:day == 1 && a:month == 1
+"           return 1 " happy new year
+"         else
+"           return 0 " or not
+"         endif
+"       endfunction
+"       let calendar_sign = 'MyCalSign'
+"
+"     *if you want to hook calender when pressing 'today',
+"       add this to your .vimrc:
+"
+"       function MyCalToday()
+"       endfunction
+"       let calendar_today = 'MyCalToday'
+"
+"     *if you want to get the version of this.
+"       type below.
+"
+"       :echo calendar_version
+" GetLatestVimScripts: 52 1 :AutoInstall: calendar.vim
+
+let g:calendar_version = "2.5"
+if &compatible
+  finish
+endif
+
+if !exists("g:calendar_action")
+  let g:calendar_action = "<SID>CalendarDiary"
+endif
+if !exists("g:calendar_sign")
+  let g:calendar_sign = "<SID>CalendarSign"
+endif
+if !exists("g:calendar_mark")
+ \|| (g:calendar_mark != 'left'
+ \&& g:calendar_mark != 'left-fit'
+ \&& g:calendar_mark != 'right')
+  let g:calendar_mark = 'left'
+endif
+if !exists("g:calendar_navi")
+ \|| (g:calendar_navi != 'top'
+ \&& g:calendar_navi != 'bottom'
+ \&& g:calendar_navi != 'both'
+ \&& g:calendar_navi != '')
+  let g:calendar_navi = 'top'
+endif
+if !exists("g:calendar_navi_label")
+  let g:calendar_navi_label = "Prev,Today,Next"
+endif
+if !exists("g:calendar_diary")
+  let g:calendar_diary = "~/diary"
+endif
+if !exists("g:calendar_focus_today")
+  let g:calendar_focus_today = 0
+endif
+if !exists("g:calendar_datetime")
+ \|| (g:calendar_datetime != ''
+ \&& g:calendar_datetime != 'title'
+ \&& g:calendar_datetime != 'statusline')
+  let g:calendar_datetime = 'title'
+endif
+if !exists("g:calendar_options")
+  let g:calendar_options="fdc=0 nonu"
+  if has("+relativenumber")
+    let g:calendar_options .= " nornu"
+  endif
+endif
+
+"*****************************************************************
+"* Calendar commands
+"*****************************************************************
+command! -nargs=* Calendar  call Calendar(0,<f-args>)
+command! -nargs=* CalendarH call Calendar(1,<f-args>)
+
+if !hasmapto("<Plug>CalendarV")
+  nmap <unique> <Leader>cal <Plug>CalendarV
+endif
+if !hasmapto("<Plug>CalendarH")
+  nmap <unique> <Leader>caL <Plug>CalendarH
+endif
+nnoremap <silent> <Plug>CalendarV :cal Calendar(0)<CR>
+nnoremap <silent> <Plug>CalendarH :cal Calendar(1)<CR>
+
+"*****************************************************************
+"* GetToken : get token from source with count
+"*----------------------------------------------------------------
+"*   src : source
+"*   dlm : delimiter
+"*   cnt : skip count
+"*****************************************************************
+function! s:GetToken(src,dlm,cnt)
+  let tokn_hit=0     " flag of found
+  let tokn_fnd=''    " found path
+  let tokn_spl=''    " token
+  let tokn_all=a:src " all source
+
+  " safe for end
+  let tokn_all = tokn_all.a:dlm
+  while 1
+    let tokn_spl = strpart(tokn_all,0,match(tokn_all,a:dlm))
+    let tokn_hit = tokn_hit + 1
+    if tokn_hit == a:cnt
+      return tokn_spl
+    endif
+    let tokn_all = strpart(tokn_all,strlen(tokn_spl.a:dlm))
+    if tokn_all == ''
+      break
+    endif
+  endwhile
+  return ''
+endfunction
+
+"*****************************************************************
+"* CalendarDoAction : call the action handler function
+"*----------------------------------------------------------------
+"*****************************************************************
+function! s:CalendarDoAction(...)
+  " for navi
+  if exists('g:calendar_navi')
+    let navi = (a:0 > 0)? a:1 : expand("<cWORD>")
+    let curl = line(".")
+    if navi == '<' . s:GetToken(g:calendar_navi_label, ',', 1)
+      if b:CalendarMonth > 1
+        call Calendar(b:CalendarDir, b:CalendarYear, b:CalendarMonth-1)
+      else
+        call Calendar(b:CalendarDir, b:CalendarYear-1, 12)
+      endif
+    elseif navi == s:GetToken(g:calendar_navi_label, ',', 3) . '>'
+      if b:CalendarMonth < 12
+        call Calendar(b:CalendarDir, b:CalendarYear, b:CalendarMonth+1)
+      else
+        call Calendar(b:CalendarDir, b:CalendarYear+1, 1)
+      endif
+    elseif navi == s:GetToken(g:calendar_navi_label, ',', 2)
+      call Calendar(b:CalendarDir)
+      if exists('g:calendar_today')
+        exe "call " . g:calendar_today . "()"
+      endif
+    else
+      let navi = ''
+    endif
+    if navi != ''
+      if g:calendar_focus_today == 1 && search("\*","w") > 0
+        silent execute "normal! gg/\*\<cr>"
+        return
+      else
+        if curl < line('$')/2
+          silent execute "normal! gg0/".navi."\<cr>"
+        else
+          silent execute "normal! G$?".navi."\<cr>"
+        endif
+        return
+      endif
+    endif
+  endif
+
+  " if no action defined return
+  if !exists("g:calendar_action") || g:calendar_action == ""
+    return
+  endif
+
+  if b:CalendarDir
+    let dir = 'H'
+    if exists('g:calendar_weeknm')
+      let cnr = col('.') - (col('.')%(24+5)) + 1
+    else
+      let cnr = col('.') - (col('.')%(24)) + 1
+    endif
+    let week = ((col(".") - cnr - 1 + cnr/49) / 3)
+  else
+    let dir = 'V'
+    let cnr = 1
+    let week = ((col(".")+1) / 3) - 1
+  endif
+  let lnr = 1
+  let hdr = 1
+  while 1
+    if lnr > line('.')
+      break
+    endif
+    let sline = getline(lnr)
+    if sline =~ '^\s*$'
+      let hdr = lnr + 1
+    endif
+    let lnr = lnr + 1
+  endwhile
+  let lnr = line('.')
+  if(exists('g:calendar_monday'))
+      let week = week + 1
+  elseif(week == 0)
+      let week = 7
+  endif
+  if lnr-hdr < 2
+    return
+  endif
+  let sline = substitute(strpart(getline(hdr),cnr,21),'\s*\(.*\)\s*','\1','')
+  if (col(".")-cnr) > 21
+    return
+  endif
+
+  " extract day
+  if g:calendar_mark == 'right' && col('.') > 1
+    normal! h
+    let day = matchstr(expand("<cword>"), '[^0].*')
+    normal! l
+  else
+    let day = matchstr(expand("<cword>"), '[^0].*')
+  endif
+  if day == 0
+    return
+  endif
+  " extract year and month
+  if exists('g:calendar_erafmt') && g:calendar_erafmt !~ "^\s*$"
+    let year = matchstr(substitute(sline, '/.*', '', ''), '\d\+')
+    let month = matchstr(substitute(sline, '.*/\(\d\d\=\).*', '\1', ""), '[^0].*')
+    if g:calendar_erafmt =~ '.*,[+-]*\d\+'
+      let veranum=substitute(g:calendar_erafmt,'.*,\([+-]*\d\+\)','\1','')
+      if year-veranum > 0
+        let year=year-veranum
+      endif
+    endif
+  else
+    let year  = matchstr(substitute(sline, '/.*', '', ''), '[^0].*')
+    let month = matchstr(substitute(sline, '\d*/\(\d\d\=\).*', '\1', ""), '[^0].*')
+  endif
+  " call the action function
+  exe "call " . g:calendar_action . "(day, month, year, week, dir)"
+endfunc
+
+"*****************************************************************
+"* Calendar : build calendar
+"*----------------------------------------------------------------
+"*   a1 : direction
+"*   a2 : month(if given a3, it's year)
+"*   a3 : if given, it's month
+"*****************************************************************
+function! Calendar(...)
+
+  "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  "+++ ready for build
+  "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  " remember today
+  " divide strftime('%d') by 1 so as to get "1,2,3 .. 9" instead of "01, 02, 03 .. 09"
+  let vtoday = strftime('%Y').strftime('%m').strftime('%d')
+
+  " get arguments
+  if a:0 == 0
+    let dir = 0
+    let vyear = strftime('%Y')
+    let vmnth = matchstr(strftime('%m'), '[^0].*')
+  elseif a:0 == 1
+    let dir = a:1
+    let vyear = strftime('%Y')
+    let vmnth = matchstr(strftime('%m'), '[^0].*')
+  elseif a:0 == 2
+    let dir = a:1
+    let vyear = strftime('%Y')
+    let vmnth = matchstr(a:2, '^[^0].*')
+  else
+    let dir = a:1
+    let vyear = a:2
+    let vmnth = matchstr(a:3, '^[^0].*')
+  endif
+
+  " remember constant
+  let vmnth_org = vmnth
+  let vyear_org = vyear
+
+  " start with last month
+  let vmnth = vmnth - 1
+  if vmnth < 1
+    let vmnth = 12
+    let vyear = vyear - 1
+  endif
+
+  " reset display variables
+  let vdisplay1 = ''
+  let vheight = 1
+  let vmcnt = 0
+
+  "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  "+++ build display
+  "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  if exists("g:calendar_begin")
+    exe "call " . g:calendar_begin . "()"
+  endif
+  while vmcnt < 3
+    let vcolumn = 22
+    let vnweek = -1
+    "--------------------------------------------------------------
+    "--- calculating
+    "--------------------------------------------------------------
+    " set boundary of the month
+    if vmnth == 1
+      let vmdays = 31
+      let vparam = 1
+      let vsmnth = 'Jan'
+    elseif vmnth == 2
+      let vmdays = 28
+      let vparam = 32
+      let vsmnth = 'Feb'
+    elseif vmnth == 3
+      let vmdays = 31
+      let vparam = 60
+      let vsmnth = 'Mar'
+    elseif vmnth == 4
+      let vmdays = 30
+      let vparam = 91
+      let vsmnth = 'Apr'
+    elseif vmnth == 5
+      let vmdays = 31
+      let vparam = 121
+      let vsmnth = 'May'
+    elseif vmnth == 6
+      let vmdays = 30
+      let vparam = 152
+      let vsmnth = 'Jun'
+    elseif vmnth == 7
+      let vmdays = 31
+      let vparam = 182
+      let vsmnth = 'Jul'
+    elseif vmnth == 8
+      let vmdays = 31
+      let vparam = 213
+      let vsmnth = 'Aug'
+    elseif vmnth == 9
+      let vmdays = 30
+      let vparam = 244
+      let vsmnth = 'Sep'
+    elseif vmnth == 10
+      let vmdays = 31
+      let vparam = 274
+      let vsmnth = 'Oct'
+    elseif vmnth == 11
+      let vmdays = 30
+      let vparam = 305
+      let vsmnth = 'Nov'
+    elseif vmnth == 12
+      let vmdays = 31
+      let vparam = 335
+      let vsmnth = 'Dec'
+    else
+      echo 'Invalid Year or Month'
+      return
+    endif
+    if vyear % 400 == 0
+      if vmnth == 2
+        let vmdays = 29
+      elseif vmnth >= 3
+        let vparam = vparam + 1
+      endif
+    elseif vyear % 100 == 0
+      if vmnth == 2
+        let vmdays = 28
+      endif
+    elseif vyear % 4 == 0
+      if vmnth == 2
+        let vmdays = 29
+      elseif vmnth >= 3
+        let vparam = vparam + 1
+      endif
+    endif
+
+    " calc vnweek of the day
+    if vnweek == -1
+      let vnweek = ( vyear * 365 ) + vparam
+      let vnweek = vnweek + ( vyear/4 ) - ( vyear/100 ) + ( vyear/400 )
+      if vyear % 4 == 0
+        if vyear % 100 != 0 || vyear % 400 == 0
+          let vnweek = vnweek - 1
+        endif
+      endif
+      let vnweek = vnweek - 1
+    endif
+
+    " fix Gregorian
+    if vyear <= 1752
+      let vnweek = vnweek - 3
+    endif
+
+    let vnweek = vnweek % 7
+
+    if exists('g:calendar_monday')
+      " if given g:calendar_monday, the week start with monday
+      if vnweek == 0
+        let vnweek = 7
+      endif
+      let vnweek = vnweek - 1
+    endif
+
+    if exists('g:calendar_weeknm')
+      " if given g:calendar_weeknm, show week number(ref:ISO8601)
+
+      "vparam <= 1. day of month
+      "vnweek <= 1. weekday of month (0-6)
+      "viweek <= number of week
+      "vfweek <= 1. day of year
+
+      " mo di mi do fr sa so
+      " 6  5  4  3  2  1  0  vfweek
+      " 0  1  2  3  4  5  6  vnweek
+
+      let vfweek =((vparam % 7)  -vnweek+ 14-2) % 7
+      let viweek = (vparam - vfweek-2+7 ) / 7 +1 
+
+      if vfweek < 3
+         let viweek = viweek - 1
+      endif
+
+      "vfweekl  <=year length
+      let vfweekl = 52
+      if (vfweek == 3)  
+        let vfweekl = 53
+      endif
+
+      if viweek == 0
+        let viweek = 52
+        if ((vfweek == 2) && (((vyear-1) % 4) !=0)) 
+              \ || ((vfweek == 1) && (((vyear-1) % 4) ==0))
+          let viweek = 53
+        endif
+      endif
+
+      let vcolumn = vcolumn + 5
+    endif
+
+    "--------------------------------------------------------------
+    "--- displaying
+    "--------------------------------------------------------------
+    " build header
+    if exists('g:calendar_erafmt') && g:calendar_erafmt !~ "^\s*$"
+      if g:calendar_erafmt =~ '.*,[+-]*\d\+'
+        let veranum=substitute(g:calendar_erafmt,'.*,\([+-]*\d\+\)','\1','')
+        if vyear+veranum > 0
+          let vdisplay2=substitute(g:calendar_erafmt,'\(.*\),.*','\1','') 
+          let vdisplay2=vdisplay2.(vyear+veranum).'/'.vmnth.'('
+        else
+          let vdisplay2=vyear.'/'.vmnth.'('
+        endif
+      else
+        let vdisplay2=vyear.'/'.vmnth.'('
+      endif
+      let vdisplay2=strpart("                           ",
+        \ 1,(vcolumn-strlen(vdisplay2))/2-2).vdisplay2
+    else
+      let vdisplay2=vyear.'/'.vmnth.'('
+      let vdisplay2=strpart("                           ",
+        \ 1,(vcolumn-strlen(vdisplay2))/2-2).vdisplay2
+    endif
+    if exists('g:calendar_mruler') && g:calendar_mruler !~ "^\s*$"
+      let vdisplay2=vdisplay2.s:GetToken(g:calendar_mruler,',',vmnth).')'."\n"
+    else
+      let vdisplay2=vdisplay2.vsmnth.')'."\n"
+    endif
+    let vwruler = "Su Mo Tu We Th Fr Sa"
+    if exists('g:calendar_wruler') && g:calendar_wruler !~ "^\s*$"
+      let vwruler = g:calendar_wruler
+    endif
+    if exists('g:calendar_monday')
+      let vwruler = strpart(vwruler,stridx(vwruler, ' ') + 1).' '.strpart(vwruler,0,stridx(vwruler, ' '))
+    endif
+    let vdisplay2 = vdisplay2.' '.vwruler."\n"
+    if g:calendar_mark == 'right'
+      let vdisplay2 = vdisplay2.' '
+    endif
+
+    " build calendar
+    let vinpcur = 0
+    while (vinpcur < vnweek)
+      let vdisplay2=vdisplay2.'   '
+      let vinpcur = vinpcur + 1
+    endwhile
+    let vdaycur = 1
+    while (vdaycur <= vmdays)
+      if vmnth < 10
+         let vtarget =vyear."0".vmnth
+      else
+         let vtarget =vyear.vmnth
+      endif
+      if vdaycur < 10
+         let vtarget = vtarget."0".vdaycur
+      else
+         let vtarget = vtarget.vdaycur
+      endif
+      if exists("g:calendar_sign") && g:calendar_sign != ""
+        exe "let vsign = " . g:calendar_sign . "(vdaycur, vmnth, vyear)"
+        if vsign != ""
+          let vsign = vsign[0]
+          if vsign !~ "[+!#$%&@?]"
+            let vsign = "+"
+          endif
+        endif
+      else
+        let vsign = ''
+      endif
+
+      " show mark
+      if g:calendar_mark == 'right'
+        if vdaycur < 10
+          let vdisplay2=vdisplay2.' '
+        endif
+        let vdisplay2=vdisplay2.vdaycur
+      elseif g:calendar_mark == 'left-fit'
+        if vdaycur < 10
+          let vdisplay2=vdisplay2.' '
+        endif
+      endif
+      if vtarget == vtoday
+        let vdisplay2=vdisplay2.'*'
+      elseif vsign != ''
+        let vdisplay2=vdisplay2.vsign
+      else
+        let vdisplay2=vdisplay2.' '
+      endif
+      if g:calendar_mark == 'left'
+        if vdaycur < 10
+          let vdisplay2=vdisplay2.' '
+        endif
+        let vdisplay2=vdisplay2.vdaycur
+      endif
+      if g:calendar_mark == 'left-fit'
+        let vdisplay2=vdisplay2.vdaycur
+      endif
+      let vdaycur = vdaycur + 1
+
+      " fix Gregorian
+      if vyear == 1752 && vmnth == 9 && vdaycur == 3
+        let vdaycur = 14
+      endif
+
+      let vinpcur = vinpcur + 1
+      if vinpcur % 7 == 0
+        if exists('g:calendar_weeknm')
+          if g:calendar_mark != 'right'
+            let vdisplay2=vdisplay2.' '
+          endif
+          " if given g:calendar_weeknm, show week number
+          if viweek < 10
+            if g:calendar_weeknm == 1
+              let vdisplay2=vdisplay2.'WK0'.viweek
+            elseif g:calendar_weeknm == 2
+              let vdisplay2=vdisplay2.'WK '.viweek
+            elseif g:calendar_weeknm == 3
+              let vdisplay2=vdisplay2.'KW0'.viweek
+            elseif g:calendar_weeknm == 4
+              let vdisplay2=vdisplay2.'KW '.viweek
+            endif
+          else
+            if g:calendar_weeknm <= 2
+              let vdisplay2=vdisplay2.'WK'.viweek
+            else
+              let vdisplay2=vdisplay2.'KW'.viweek
+            endif
+          endif
+          let viweek = viweek + 1
+
+          if viweek > vfweekl
+            let viweek = 1
+          endif
+
+        endif
+        let vdisplay2=vdisplay2."\n"
+        if g:calendar_mark == 'right'
+          let vdisplay2 = vdisplay2.' '
+        endif
+      endif
+    endwhile
+
+    " if it is needed, fill with space
+    if vinpcur % 7 
+      while (vinpcur % 7 != 0)
+        let vdisplay2=vdisplay2.'   '
+        let vinpcur = vinpcur + 1
+      endwhile
+      if exists('g:calendar_weeknm')
+        if g:calendar_mark != 'right'
+          let vdisplay2=vdisplay2.' '
+        endif
+        if viweek < 10
+          if g:calendar_weeknm == 1
+            let vdisplay2=vdisplay2.'WK0'.viweek
+          elseif g:calendar_weeknm == 2
+            let vdisplay2=vdisplay2.'WK '.viweek
+          elseif g:calendar_weeknm == 3
+            let vdisplay2=vdisplay2.'KW0'.viweek
+          elseif g:calendar_weeknm == 4
+            let vdisplay2=vdisplay2.'KW '.viweek
+          endif
+        else
+          if g:calendar_weeknm <= 2
+            let vdisplay2=vdisplay2.'WK'.viweek
+          else
+            let vdisplay2=vdisplay2.'KW'.viweek
+          endif
+        endif
+      endif
+    endif
+
+    " build display
+    let vstrline = ''
+    if dir
+      " for horizontal
+      "--------------------------------------------------------------
+      " +---+   +---+   +------+
+      " |   |   |   |   |      |
+      " | 1 | + | 2 | = |  1'  |
+      " |   |   |   |   |      |
+      " +---+   +---+   +------+
+      "--------------------------------------------------------------
+      let vtokline = 1
+      while 1
+        let vtoken1 = s:GetToken(vdisplay1,"\n",vtokline)
+        let vtoken2 = s:GetToken(vdisplay2,"\n",vtokline)
+        if vtoken1 == '' && vtoken2 == ''
+          break
+        endif
+        while strlen(vtoken1) < (vcolumn+1)*vmcnt
+          if strlen(vtoken1) % (vcolumn+1) == 0
+            let vtoken1 = vtoken1.'|'
+          else
+            let vtoken1 = vtoken1.' '
+          endif
+        endwhile
+        let vstrline = vstrline.vtoken1.'|'.vtoken2.' '."\n"
+        let vtokline = vtokline + 1
+      endwhile
+      let vdisplay1 = vstrline
+      let vheight = vtokline-1
+    else
+      " for virtical
+      "--------------------------------------------------------------
+      " +---+   +---+   +---+
+      " | 1 | + | 2 | = |   |
+      " +---+   +---+   | 1'|
+      "                 |   |
+      "                 +---+
+      "--------------------------------------------------------------
+      let vtokline = 1
+      while 1
+        let vtoken1 = s:GetToken(vdisplay1,"\n",vtokline)
+        if vtoken1 == ''
+          break
+        endif
+        let vstrline = vstrline.vtoken1."\n"
+        let vtokline = vtokline + 1
+        let vheight = vheight + 1
+      endwhile
+      if vstrline != ''
+        let vstrline = vstrline.' '."\n"
+        let vheight = vheight + 1
+      endif
+      let vtokline = 1
+      while 1
+        let vtoken2 = s:GetToken(vdisplay2,"\n",vtokline)
+        if vtoken2 == ''
+          break
+        endif
+        while strlen(vtoken2) < vcolumn
+          let vtoken2 = vtoken2.' '
+        endwhile
+        let vstrline = vstrline.vtoken2."\n"
+        let vtokline = vtokline + 1
+        let vheight = vtokline + 1
+      endwhile
+      let vdisplay1 = vstrline
+    endif
+    let vmnth = vmnth + 1
+    let vmcnt = vmcnt + 1
+    if vmnth > 12
+      let vmnth = 1
+      let vyear = vyear + 1
+    endif
+  endwhile
+  if exists("g:calendar_end")
+    exe "call " . g:calendar_end . "()"
+  endif
+  if a:0 == 0
+    return vdisplay1
+  endif
+
+  "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  "+++ build window
+  "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  " make window
+  let vwinnum=bufnr('__Calendar')
+  if getbufvar(vwinnum, 'Calendar')=='Calendar'
+    let vwinnum=bufwinnr(vwinnum)
+  else
+    let vwinnum=-1
+  endif
+
+  if vwinnum >= 0
+    " if already exist
+    if vwinnum != bufwinnr('%')
+      exe vwinnum . 'wincmd w'
+    endif
+    setlocal modifiable
+    silent %d _
+  else
+    " make title
+    if g:calendar_datetime == "title" && (!exists('s:bufautocommandsset'))
+      auto BufEnter *Calendar let b:sav_titlestring = &titlestring | let &titlestring = '%{strftime("%c")}'
+      auto BufLeave *Calendar let &titlestring = b:sav_titlestring
+      let s:bufautocommandsset=1
+    endif
+
+    if exists('g:calendar_navi') && dir
+      if g:calendar_navi == 'both'
+        let vheight = vheight + 4
+      else
+        let vheight = vheight + 2
+      endif
+    endif
+
+    " or not
+    if dir
+      silent execute 'bo '.vheight.'split __Calendar'
+      setlocal winfixheight
+    else
+      silent execute 'to '.vcolumn.'vsplit __Calendar'
+      setlocal winfixwidth
+    endif
+    call s:CalendarBuildKeymap(dir, vyear, vmnth)
+    setlocal noswapfile
+    setlocal buftype=nofile
+    setlocal bufhidden=delete
+    silent! exe "setlocal " . g:calendar_options
+    let nontext_columns = &foldcolumn + &nu * &numberwidth
+    if has("+relativenumber")
+      let nontext_columns += &rnu * &numberwidth
+    endif
+    " Without this, the 'sidescrolloff' setting may cause the left side of the
+    " calendar to disappear if the last inserted element is near the right
+    " window border.
+    setlocal nowrap
+    setlocal norightleft
+    setlocal modifiable
+    setlocal nolist
+    let b:Calendar='Calendar'
+    setlocal filetype=calendar
+    " is this a vertical (0) or a horizontal (1) split?
+    exe vcolumn + nontext_columns . "wincmd |"
+  endif
+  if g:calendar_datetime == "statusline"
+    setlocal statusline=%{strftime('%c')}
+  endif
+  let b:CalendarDir=dir
+  let b:CalendarYear = vyear_org
+  let b:CalendarMonth = vmnth_org
+
+  " navi
+  if exists('g:calendar_navi')
+    let navi_label = '<'
+        \.s:GetToken(g:calendar_navi_label, ',', 1).' '
+        \.s:GetToken(g:calendar_navi_label, ',', 2).' '
+        \.s:GetToken(g:calendar_navi_label, ',', 3).'>'
+    if dir
+      let navcol = vcolumn + (vcolumn-strlen(navi_label)+2)/2
+    else
+      let navcol = (vcolumn-strlen(navi_label)+2)/2
+    endif
+    if navcol < 3
+      let navcol = 3
+    endif
+
+    if g:calendar_navi == 'top'
+      execute "normal gg".navcol."i "
+      silent exec "normal! a".navi_label."\<cr>\<cr>"
+      silent put! =vdisplay1
+    endif
+    if g:calendar_navi == 'bottom'
+      silent put! =vdisplay1
+      silent exec "normal! Gi\<cr>"
+      execute "normal ".navcol."i "
+      silent exec "normal! a".navi_label
+    endif
+    if g:calendar_navi == 'both'
+      execute "normal gg".navcol."i "
+      silent exec "normal! a".navi_label."\<cr>\<cr>"
+      silent put! =vdisplay1
+      silent exec "normal! Gi\<cr>"
+      execute "normal ".navcol."i "
+      silent exec "normal! a".navi_label
+    endif
+  else
+    silent put! =vdisplay1
+  endif
+
+  setlocal nomodifiable
+  " In case we've gotten here from insert mode (via <C-O>:Calendar<CR>)...
+  stopinsert
+
+  let vyear = vyear_org
+  let vmnth = vmnth_org
+
+  "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  "+++ build highlight
+  "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  " today
+  syn clear
+  if g:calendar_mark =~ 'left-fit'
+    syn match CalToday display "\s*\*\d*"
+    syn match CalMemo display "\s*[+!#$%&@?]\d*"
+  elseif g:calendar_mark =~ 'right'
+    syn match CalToday display "\d*\*\s*"
+    syn match CalMemo display "\d*[+!#$%&@?]\s*"
+  else
+    syn match CalToday display "\*\s*\d*"
+    syn match CalMemo display "[+!#$%&@?]\s*\d*"
+  endif
+  " header
+  syn match CalHeader display "[^ ]*\d\+\/\d\+([^)]*)"
+
+  " navi
+  if exists('g:calendar_navi')
+    exec "silent! syn match CalNavi display \"\\(<"
+        \.s:GetToken(g:calendar_navi_label, ',', 1)."\\|"
+        \.s:GetToken(g:calendar_navi_label, ',', 3).">\\)\""
+    exec "silent! syn match CalNavi display \"\\s"
+        \.s:GetToken(g:calendar_navi_label, ',', 2)."\\s\"hs=s+1,he=e-1"
+  endif
+
+  " saturday, sunday
+  let dayorspace = '\(\*\|\s\)\(\s\|\d\)\(\s\|\d\)'
+  if !exists('g:calendar_weeknm') || g:calendar_weeknm <= 2
+    let wknmstring = '\(\sWK[0-9\ ]\d\)*'
+  else
+    let wknmstring = '\(\sKW[0-9\ ]\d\)*'
+  endif
+  let eolnstring = '\s\(|\|$\)'
+  if exists('g:calendar_monday')
+    execute "syn match CalSaturday display \'"
+      \.dayorspace.dayorspace.wknmstring.eolnstring."\'ms=s+1,me=s+3"
+    execute "syn match CalSunday display \'"
+      \.dayorspace.wknmstring.eolnstring."\'ms=s+1,me=s+3"
+  else
+    if dir
+      execute "syn match CalSaturday display \'"
+        \.dayorspace.wknmstring.eolnstring."\'ms=s+1,me=s+3"
+      execute "syn match CalSunday display \'\|"
+        \.dayorspace."\'ms=s+2,me=s+4"
+    else
+      execute "syn match CalSaturday display \'"
+        \.dayorspace.wknmstring.eolnstring."\'ms=s+1,me=s+3"
+      execute "syn match CalSunday display \'^"
+        \.dayorspace."\'ms=s+1,me=s+3"
+    endif
+  endif
+
+  " week number
+  if !exists('g:calendar_weeknm') || g:calendar_weeknm <= 2
+    syn match CalWeeknm display "WK[0-9\ ]\d"
+  else
+    syn match CalWeeknm display "KW[0-9\ ]\d"
+  endif
+
+  " ruler
+  execute 'syn match CalRuler "'.vwruler.'"'
+
+  if search("\*","w") > 0
+    silent execute "normal! gg/\*\<cr>"
+  endif
+
+  return ''
+endfunction
+
+"*****************************************************************
+"* CalendarMakeDir : make directory
+"*----------------------------------------------------------------
+"*   dir : directory
+"*****************************************************************
+function! s:CalendarMakeDir(dir)
+  if(has("unix"))
+    call system("mkdir " . a:dir)
+    let rc = v:shell_error
+  elseif(has("win16") || has("win32") || has("win95") ||
+              \has("dos16") || has("dos32") || has("os2"))
+    call system("mkdir \"" . a:dir . "\"")
+    let rc = v:shell_error
+  else
+    let rc = 1
+  endif
+  if rc != 0
+    call confirm("can't create directory : " . a:dir, "&OK")
+  endif
+  return rc
+endfunc
+
+"*****************************************************************
+"* CalendarDiary : calendar hook function
+"*----------------------------------------------------------------
+"*   day   : day you actioned
+"*   month : month you actioned
+"*   year  : year you actioned
+"*****************************************************************
+function! s:CalendarDiary(day, month, year, week, dir)
+  " build the file name and create directories as needed
+  if !isdirectory(expand(g:calendar_diary))
+    call confirm("please create diary directory : ".g:calendar_diary, 'OK')
+    return
+  endif
+  let sfile = expand(g:calendar_diary) . "/" . a:year
+  if isdirectory(sfile) == 0
+    if s:CalendarMakeDir(sfile) != 0
+      return
+    endif
+  endif
+  let sfile = sfile . "/" . a:month
+  if isdirectory(sfile) == 0
+    if s:CalendarMakeDir(sfile) != 0
+      return
+    endif
+  endif
+  let sfile = expand(sfile) . "/" . a:day . ".cal"
+  let sfile = substitute(sfile, ' ', '\\ ', 'g')
+  let vbufnr = bufnr('__Calendar')
+
+  " load the file
+  exe "sp " . sfile
+  setlocal ft=calendar
+  let dir = getbufvar(vbufnr, "CalendarDir")
+  let vyear = getbufvar(vbufnr, "CalendarYear")
+  let vmnth = getbufvar(vbufnr, "CalendarMonth")
+  exe "auto BufDelete ".escape(sfile, ' \\')." call Calendar(" . dir . "," . vyear . "," . vmnth . ")"
+endfunc
+
+"*****************************************************************
+"* CalendarSign : calendar sign function
+"*----------------------------------------------------------------
+"*   day   : day of sign
+"*   month : month of sign
+"*   year  : year of sign
+"*****************************************************************
+function! s:CalendarSign(day, month, year)
+  let sfile = g:calendar_diary."/".a:year."/".a:month."/".a:day.".cal"
+  return filereadable(expand(sfile))
+endfunction
+
+"*****************************************************************
+"* CalendarVar : get variable
+"*----------------------------------------------------------------
+"*****************************************************************
+function! s:CalendarVar(var)
+  if !exists(a:var)
+    return ''
+  endif
+  exec 'return ' . a:var
+endfunction
+
+"*****************************************************************
+"* CalendarBuildKeymap : build keymap
+"*----------------------------------------------------------------
+"*****************************************************************
+function! s:CalendarBuildKeymap(dir, vyear, vmnth)
+  " make keymap
+  execute 'nnoremap <silent> <buffer> q :close<bar>wincmd p<cr>'
+
+  execute 'nnoremap <silent> <buffer> <Plug>CalendarDoAction  :call <SID>CalendarDoAction()<cr>'
+  execute 'nnoremap <silent> <buffer> <Plug>CalendarDoAction  :call <SID>CalendarDoAction()<cr>'
+  execute 'nnoremap <silent> <buffer> <Plug>CalendarGotoToday :call Calendar(b:CalendarDir)<cr>'
+  execute 'nnoremap <silent> <buffer> <Plug>CalendarShowHelp  :call <SID>CalendarHelp()<cr>'
+  execute 'nnoremap <silent> <buffer> <Plug>CalendarReDisplay :call Calendar(' . a:dir . ',' . a:vyear . ',' . a:vmnth . ')<cr>'
+  let pnav = s:GetToken(g:calendar_navi_label, ',', 1)
+  let nnav = s:GetToken(g:calendar_navi_label, ',', 3)
+  execute 'nnoremap <silent> <buffer> <Plug>CalendarGotoPrevMonth :call <SID>CalendarDoAction("<' . pnav . '")<cr>'
+  execute 'nnoremap <silent> <buffer> <Plug>CalendarGotoNextMonth :call <SID>CalendarDoAction("' . nnav . '>")<cr>'
+  execute 'nnoremap <silent> <buffer> <Plug>CalendarGotoPrevYear  :call Calendar('.a:dir.','.(a:vyear-1).','.a:vmnth.')<cr>'
+  execute 'nnoremap <silent> <buffer> <Plug>CalendarGotoNextYear  :call Calendar('.a:dir.','.(a:vyear+1).','.a:vmnth.')<cr>'
+
+  nmap <buffer> <CR>          <Plug>CalendarDoAction
+  nmap <buffer> <2-LeftMouse> <Plug>CalendarDoAction
+  nmap <buffer> t             <Plug>CalendarGotoToday
+  nmap <buffer> ?             <Plug>CalendarShowHelp
+  nmap <buffer> r             <Plug>CalendarReDisplay
+
+  nmap <buffer> <Left>  <Plug>CalendarGotoPrevMonth
+  nmap <buffer> <Right> <Plug>CalendarGotoNextMonth
+  nmap <buffer> <Up>    <Plug>CalendarGotoPrevYear
+  nmap <buffer> <Down>  <Plug>CalendarGotoNextYear
+endfunction
+
+"*****************************************************************
+"* CalendarHelp : show help for Calendar
+"*----------------------------------------------------------------
+"*****************************************************************
+function! s:CalendarHelp()
+  echohl None
+  echo 'Calendar version ' . g:calendar_version
+  echohl SpecialKey
+  echo '<Left>    : goto prev month'
+  echo '<Right>   : goto next month'
+  echo '<Up>      : goto prev year'
+  echo '<Down>    : goto next year'
+  echo 't         : goto today'
+  echo 'q         : close window'
+  echo 'r         : re-display window'
+  echo '?         : show this help'
+  if g:calendar_action == "<SID>CalendarDiary"
+    echo '<cr>      : show diary'
+  endif
+  echo ''
+  echohl Question
+  echo 'calendar_erafmt=' . s:CalendarVar('g:calendar_erafmt')
+  echo 'calendar_mruler=' . s:CalendarVar('g:calendar_mruler')
+  echo 'calendar_wruler=' . s:CalendarVar('g:calendar_wruler')
+  echo 'calendar_weeknm=' . s:CalendarVar('g:calendar_weeknm')
+  echo 'calendar_navi_label=' . s:CalendarVar('g:calendar_navi_label')
+  echo 'calendar_diary=' . s:CalendarVar('g:calendar_diary')
+  echo 'calendar_mark=' . s:CalendarVar('g:calendar_mark')
+  echo 'calendar_navi=' . s:CalendarVar('g:calendar_navi')
+  echohl MoreMsg
+  echo "[Hit any key]"
+  echohl None
+  call getchar()
+  redraw!
+endfunction
+
+hi def link CalNavi     Search
+hi def link CalSaturday Statement
+hi def link CalSunday   Type
+hi def link CalRuler    StatusLine
+hi def link CalWeeknm   Comment
+hi def link CalToday    Directory
+hi def link CalHeader   Special
+hi def link CalMemo     Identifier
diff --git a/plugin/tagbar.vim b/plugin/tagbar.vim
new file mode 100644
index 0000000..e8add1f
--- /dev/null
+++ b/plugin/tagbar.vim
@@ -0,0 +1,111 @@
+" ============================================================================
+" File:        tagbar.vim
+" Description: List the current file's tags in a sidebar, ordered by class etc
+" Author:      Jan Larres <jan@majutsushi.net>
+" Licence:     Vim licence
+" Website:     http://majutsushi.github.com/tagbar/
+" Version:     2.2
+" Note:        This plugin was heavily inspired by the 'Taglist' plugin by
+"              Yegappan Lakshmanan and uses a small amount of code from it.
+"
+" Original taglist copyright notice:
+"              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,
+"              taglist.vim is provided *as is* and comes with no warranty of
+"              any kind, either expressed or implied. In no event will the
+"              copyright holder be liable for any damamges resulting from the
+"              use of this software.
+" ============================================================================
+
+scriptencoding utf-8
+
+if &cp || exists('g:loaded_tagbar')
+    finish
+endif
+
+" Basic init {{{1
+
+if v:version < 700
+    echohl WarningMsg
+    echomsg 'Tagbar: Vim version is too old, Tagbar requires at least 7.0'
+    echohl None
+    finish
+endif
+
+if v:version == 700 && !has('patch167')
+    echohl WarningMsg
+    echomsg 'Tagbar: Vim versions lower than 7.0.167 have a bug'
+          \ 'that prevents this version of Tagbar from working.'
+          \ 'Please use the alternate version posted on the website.'
+    echohl None
+    finish
+endif
+
+if !exists('g:tagbar_left')
+    let g:tagbar_left = 0
+endif
+
+if !exists('g:tagbar_width')
+    let g:tagbar_width = 40
+endif
+
+if !exists('g:tagbar_autoclose')
+    let g:tagbar_autoclose = 0
+endif
+
+if !exists('g:tagbar_autofocus')
+    let g:tagbar_autofocus = 0
+endif
+
+if !exists('g:tagbar_sort')
+    let g:tagbar_sort = 1
+endif
+
+if !exists('g:tagbar_compact')
+    let g:tagbar_compact = 0
+endif
+
+if !exists('g:tagbar_expand')
+    let g:tagbar_expand = 0
+endif
+
+if !exists('g:tagbar_singleclick')
+    let g:tagbar_singleclick = 0
+endif
+
+if !exists('g:tagbar_foldlevel')
+    let g:tagbar_foldlevel = 99
+endif
+
+if !exists('g:tagbar_usearrows')
+    let g:tagbar_usearrows = 0
+endif
+
+if !exists('g:tagbar_autoshowtag')
+    let g:tagbar_autoshowtag = 0
+endif
+
+if !exists('g:tagbar_updateonsave_maxlines')
+    let g:tagbar_updateonsave_maxlines = 5000
+endif
+
+if !exists('g:tagbar_systemenc')
+    let g:tagbar_systemenc = &encoding
+endif
+
+augroup TagbarSession
+    autocmd!
+    autocmd SessionLoadPost * nested call tagbar#RestoreSession()
+augroup END
+
+" Commands {{{1
+command! -nargs=0 TagbarToggle        call tagbar#ToggleWindow()
+command! -nargs=? TagbarOpen          call tagbar#OpenWindow(<f-args>)
+command! -nargs=0 TagbarOpenAutoClose call tagbar#OpenWindow('fc')
+command! -nargs=0 TagbarClose         call tagbar#CloseWindow()
+command! -nargs=1 TagbarSetFoldlevel  call tagbar#SetFoldLevel(<args>)
+command! -nargs=0 TagbarShowTag       call tagbar#OpenParents()
+
+" Modeline {{{1
+" vim: ts=8 sw=4 sts=4 et foldenable foldmethod=marker foldcolumn=1
diff --git a/syntax/tagbar.vim b/syntax/tagbar.vim
index 7b0f0b5..89458fd 100644
--- a/syntax/tagbar.vim
+++ b/syntax/tagbar.vim
@@ -3,7 +3,9 @@
 " Author:      Jan Larres <jan@majutsushi.net>
 " Licence:     Vim licence
 " Website:     http://majutsushi.github.com/tagbar/
-" Version:     2.1
+" Version:     2.2
+
+scriptencoding utf-8
 
 if exists("b:current_syntax")
   finish
@@ -39,22 +41,26 @@ else
     syntax match TagbarAccessPrivate   '\([-+ ]\)\@<=-\([^-+# ]\)\@='
 endif
 
-syntax match TagbarComment   '^".*'
-syntax match TagbarType      ' : \zs.*'
-syntax match TagbarSignature '(.*)'
-syntax match TagbarPseudoID  '\*\ze :'
+syntax match TagbarNestedKind '^\s\+\[[^]]\+\]$'
+syntax match TagbarComment    '^".*'
+syntax match TagbarType       ' : \zs.*'
+syntax match TagbarSignature  '(.*)'
+syntax match TagbarPseudoID   '\*\ze :'
 
-highlight default link TagbarComment   Comment
-highlight default link TagbarKind      Identifier
-highlight default link TagbarScope     Title
-highlight default link TagbarType      Type
-highlight default link TagbarSignature SpecialKey
-highlight default link TagbarPseudoID  NonText
-highlight default link TagbarFoldIcon  Statement
-highlight default link TagbarHighlight Search
+highlight default link TagbarComment    Comment
+highlight default link TagbarKind       Identifier
+highlight default link TagbarNestedKind TagbarKind
+highlight default link TagbarScope      Title
+highlight default link TagbarType       Type
+highlight default link TagbarSignature  SpecialKey
+highlight default link TagbarPseudoID   NonText
+highlight default link TagbarFoldIcon   Statement
+highlight default link TagbarHighlight  Search
 
 highlight default TagbarAccessPublic    guifg=Green ctermfg=Green
 highlight default TagbarAccessProtected guifg=Blue  ctermfg=Blue
 highlight default TagbarAccessPrivate   guifg=Red   ctermfg=Red
 
 let b:current_syntax = "tagbar"
+
+" vim: ts=8 sw=4 sts=4 et foldenable foldmethod=marker foldcolumn=1