From b25ab098da6db6d81bcac152afc1aa5e984941d6 Mon Sep 17 00:00:00 2001
From: Jan Larres <jan@majutsushi.net>
Date: Mon, 25 Apr 2011 16:09:40 +1200
Subject: [PATCH] Allow jumping to a tag definition without leaving the Tagbar
 window

---
 doc/tagbar.txt    |  4 +++-
 plugin/tagbar.vim | 15 +++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/doc/tagbar.txt b/doc/tagbar.txt
index 9a752a2..c5ecca1 100644
--- a/doc/tagbar.txt
+++ b/doc/tagbar.txt
@@ -240,7 +240,9 @@ KEY MAPPINGS						*tagbar-keys*
 These 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.
+<CR>/<Enter>  Jump to the tag under the cursor. Doesn't work for pseudo-tags
+              or generic headers.
+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>.
diff --git a/plugin/tagbar.vim b/plugin/tagbar.vim
index 08754dd..1756431 100644
--- a/plugin/tagbar.vim
+++ b/plugin/tagbar.vim
@@ -23,6 +23,8 @@ if &cp || exists('g:loaded_tagbar')
 endif
 
 " Initialization {{{1
+
+" Basic init {{{2
 if !exists('g:tagbar_ctags_bin')
     if executable('ctags-exuberant')
         let g:tagbar_ctags_bin = 'ctags-exuberant'
@@ -790,9 +792,10 @@ endfunction
 
 " s:MapKeys() {{{2
 function! s:MapKeys()
-    nnoremap <script> <silent> <buffer> <CR>    :call <SID>JumpToTag()<CR>
+    nnoremap <script> <silent> <buffer> <CR>    :call <SID>JumpToTag(0)<CR>
     nnoremap <script> <silent> <buffer> <2-LeftMouse>
-                                              \ :call <SID>JumpToTag()<CR>
+                                              \ :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>
     nnoremap <script> <silent> <buffer> <Space> :call <SID>ShowPrototype()<CR>
@@ -2121,7 +2124,7 @@ function! s:HighlightTag()
 endfunction
 
 " s:JumpToTag() {{{2
-function! s:JumpToTag()
+function! s:JumpToTag(stay_in_tagbar)
     let taginfo = s:GetTagInfo(line('.'), 1)
 
     let autoclose = w:autoclose
@@ -2130,6 +2133,7 @@ function! s:JumpToTag()
         return
     endif
 
+    let tagbarwinnr = winnr()
     execute 'wincmd p'
 
     " Mark current position so it can be jumped back to
@@ -2149,7 +2153,10 @@ function! s:JumpToTag()
 
     redraw
 
-    if g:tagbar_autoclose || autoclose
+    if a:stay_in_tagbar
+        call s:HighlightTag()
+        execute tagbarwinnr . 'wincmd w'
+    elseif g:tagbar_autoclose || autoclose
         call s:CloseWindow()
     else
         call s:HighlightTag()