Skip to content

Commit e777dbb

Browse files
majutsushivim-scripts
authored andcommitted
Version 2.6.1
- 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
1 parent 2afd139 commit e777dbb

File tree

4 files changed

+22
-6
lines changed

4 files changed

+22
-6
lines changed

autoload/tagbar.vim

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
" Author: Jan Larres <jan@majutsushi.net>
55
" Licence: Vim licence
66
" Website: http://majutsushi.github.com/tagbar/
7-
" Version: 2.6
7+
" Version: 2.6.1
88
" Note: This plugin was heavily inspired by the 'Taglist' plugin by
99
" Yegappan Lakshmanan and uses a small amount of code from it.
1010
"
@@ -1497,7 +1497,7 @@ endfunction
14971497

14981498
" s:KindheaderTag.toggleFold() {{{3
14991499
function! s:KindheaderTag.toggleFold() abort dict
1500-
let fileinfo = s:known_files.getCurrent()
1500+
let fileinfo = s:known_files.getCurrent(0)
15011501

15021502
let fileinfo.kindfolds[self.short] = !fileinfo.kindfolds[self.short]
15031503
endfunction
@@ -2125,7 +2125,7 @@ function! s:ExecuteCtagsOnFile(fname, realfname, typeinfo) abort
21252125
\ '--excmd=pattern',
21262126
\ '--fields=nksSa',
21272127
\ '--extra=',
2128-
\ '--sort=yes'
2128+
\ '--sort=no'
21292129
\ ]
21302130

21312131
" Include extra type definitions
@@ -3007,8 +3007,13 @@ function! s:JumpToTag(stay_in_tagbar) abort
30073007
call s:goto_win(tagbarwinnr)
30083008
redraw
30093009
elseif g:tagbar_autoclose || autoclose
3010+
" Also closes preview window
30103011
call s:CloseWindow()
30113012
else
3013+
" Close the preview window if it was opened by us
3014+
if s:pwin_by_tagbar
3015+
pclose
3016+
endif
30123017
call s:HighlightTag(0)
30133018
endif
30143019
endfunction
@@ -3735,6 +3740,7 @@ function! s:QuitIfOnlyWindow() abort
37353740
endif
37363741

37373742
let curwinnr = winnr()
3743+
let prevwinnr = winnr('#')
37383744
call s:goto_win(tagbarwinnr, 1)
37393745

37403746
" Check if there is more than one window
@@ -3754,6 +3760,7 @@ function! s:QuitIfOnlyWindow() abort
37543760
endif
37553761
endif
37563762

3763+
call s:goto_win(prevwinnr, 1)
37573764
call s:goto_win(curwinnr, 1)
37583765
endfunction
37593766

doc/tagbar.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Author: Jan Larres <jan@majutsushi.net>
44
Licence: Vim licence, see |license|
55
Homepage: http://majutsushi.github.com/tagbar/
6-
Version: 2.6
6+
Version: 2.6.1
77

88
==============================================================================
99
Contents *tagbar* *tagbar-contents*
@@ -1231,6 +1231,13 @@ file.
12311231
==============================================================================
12321232
8. History *tagbar-history*
12331233

1234+
2.6.1 (2014-01-23)
1235+
- Automatically close the preview window when jumping to a tag
1236+
- Don't forget the previous window in certain situations, which was
1237+
causing problems with for example fugitive
1238+
- Fixed toggling kind-specific folds
1239+
- Fixed ctags error that can happen with Cygwin
1240+
12341241
2.6 (2013-12-06)
12351242
- Added possibility to show tags in the preview window, either manually or
12361243
automatically.
@@ -1403,10 +1410,12 @@ Jan Christoph Ebersbach
14031410
Vadim Fint
14041411
Leandro Freitas
14051412
Ingo Karkat
1413+
Audrius Kažukauskas
14061414
Michael McClimon
14071415
Seth Milliken
14081416
Kien N
14091417
Darcy Parker
1418+
fritzophrenic
14101419
pielgrzym
14111420
Taybin Rutkin
14121421
Kian Ryan

plugin/tagbar.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
" Author: Jan Larres <jan@majutsushi.net>
55
" Licence: Vim licence
66
" Website: http://majutsushi.github.com/tagbar/
7-
" Version: 2.6
7+
" Version: 2.6.1
88
" Note: This plugin was heavily inspired by the 'Taglist' plugin by
99
" Yegappan Lakshmanan and uses a small amount of code from it.
1010
"

syntax/tagbar.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
" Author: Jan Larres <jan@majutsushi.net>
44
" Licence: Vim licence
55
" Website: http://majutsushi.github.com/tagbar/
6-
" Version: 2.6
6+
" Version: 2.6.1
77

88
scriptencoding utf-8
99

0 commit comments

Comments
 (0)