aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-05 05:34:07 -04:00
Code Activity

patch 8.1.0514: CTRL-W ^ does not work when alternate buffer has no name

Browse Source 
Problem:    CTRL-W ^ does not work when alternate buffer has no name.
Solution:   Use another method to split and edit the alternate buffer. (Jason
            Franklin)
This commit is contained in:
Bram Moolenaar
2018-11-10 16:02:01 +01:00
parent d0721058f4
commit 1bbb619483
6 changed files with 180 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/testdir/test_window_cmd.vim
View File

@@ -103,15 +103,65 @@ func Test_window_vertical_split()
bw
endfunc
" Test the ":wincmd ^" and "<C-W>^" commands.
func Test_window_split_edit_alternate()
e Xa
e Xb
" Test for failure when the alternate buffer/file no longer exists.
edit Xfoo | %bw
call assert_fails(':wincmd ^', 'E23')
" Test for the expected behavior when we have two named buffers.
edit Xfoo | edit Xbar
wincmd ^
call assert_equal('Xa', bufname(winbufnr(1)))
call assert_equal('Xb', bufname(winbufnr(2)))
call assert_equal('Xfoo', bufname(winbufnr(1)))
call assert_equal('Xbar', bufname(winbufnr(2)))
only
bw Xa Xb
" Test for the expected behavior when the alternate buffer is not named.
enew | let l:nr1 = bufnr('%')
edit Xfoo | let l:nr2 = bufnr('%')
wincmd ^
call assert_equal(l:nr1, winbufnr(1))
call assert_equal(l:nr2, winbufnr(2))
only
" Test the Normal mode command.
call feedkeys("\<C-W>\<C-^>", 'tx')
call assert_equal(l:nr2, winbufnr(1))
call assert_equal(l:nr1, winbufnr(2))
%bw!
endfunc
" Test the ":[count]wincmd ^" and "[count]<C-W>^" commands.
func Test_window_split_edit_bufnr()
%bwipeout
let l:nr = bufnr('%') + 1
call assert_fails(':execute "normal! ' . l:nr . '\<C-W>\<C-^>"', 'E92')
call assert_fails(':' . l:nr . 'wincmd ^', 'E16')
call assert_fails(':0wincmd ^', 'E16')
edit Xfoo | edit Xbar | edit Xbaz
let l:foo_nr = bufnr('Xfoo')
let l:bar_nr = bufnr('Xbar')
let l:baz_nr = bufnr('Xbaz')
call feedkeys(l:foo_nr . "\<C-W>\<C-^>", 'tx')
call assert_equal('Xfoo', bufname(winbufnr(1)))
call assert_equal('Xbaz', bufname(winbufnr(2)))
only
call feedkeys(l:bar_nr . "\<C-W>\<C-^>", 'tx')
call assert_equal('Xbar', bufname(winbufnr(1)))
call assert_equal('Xfoo', bufname(winbufnr(2)))
only
execute l:baz_nr . 'wincmd ^'
call assert_equal('Xbaz', bufname(winbufnr(1)))
call assert_equal('Xbar', bufname(winbufnr(2)))
%bw!
endfunc
func Test_window_preview()
@@ -322,7 +372,7 @@ func Test_equalalways_on_close()
set equalalways
vsplit
windo split
split
split
wincmd J
" now we have a frame top-left with two windows, a frame top-right with two
" windows and a frame at the bottom, full-width.