mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-09 19:36:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.2315: switchbuf=uselast #11480

Browse Source 
Problem:    Not always using the right window when jumping to an error.
Solution:   Add the "uselast" flag in 'switchbuf'. (closes vim/vim#1652)
539aa6b25e
This commit is contained in:
Daniel Hahler
2019-11-29 18:57:27 +01:00
committed by Justin M. Keyes
parent f33371c03f
commit 0a9ecf460a
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/doc/options.txt
View File

@@ -6014,6 +6014,8 @@ A jump table for the options with a short description can be found at |Q_op|.
vsplit Just like "split" but split vertically. vsplit Just like "split" but split vertically.
newtab Like "split", but open a new tab page. Overrules newtab Like "split", but open a new tab page. Overrules
"split" when both are present. "split" when both are present.
uselast If included, jump to the previously used window when
jumping to errors with |quickfix| commands.
*'synmaxcol'* *'smc'* *'synmaxcol'* *'smc'*
'synmaxcol' 'smc' number (default 3000) 'synmaxcol' 'smc' number (default 3000)

3
src/nvim/option_defs.h
View File

@@ -612,13 +612,14 @@ EXTERN char_u *p_swb; // 'switchbuf'
EXTERN unsigned swb_flags; EXTERN unsigned swb_flags;
#ifdef IN_OPTION_C #ifdef IN_OPTION_C
static char *(p_swb_values[]) = static char *(p_swb_values[]) =
{ "useopen", "usetab", "split", "newtab", "vsplit", NULL }; { "useopen", "usetab", "split", "newtab", "vsplit", "uselast", NULL };
#endif #endif
#define SWB_USEOPEN 0x001 #define SWB_USEOPEN 0x001
#define SWB_USETAB 0x002 #define SWB_USETAB 0x002
#define SWB_SPLIT 0x004 #define SWB_SPLIT 0x004
#define SWB_NEWTAB 0x008 #define SWB_NEWTAB 0x008
#define SWB_VSPLIT 0x010 #define SWB_VSPLIT 0x010
#define SWB_USELAST 0x020
EXTERN int p_tbs; ///< 'tagbsearch' EXTERN int p_tbs; ///< 'tagbsearch'
EXTERN char_u *p_tc; ///< 'tagcase' EXTERN char_u *p_tc; ///< 'tagcase'
EXTERN unsigned tc_flags; ///< flags from 'tagcase' EXTERN unsigned tc_flags; ///< flags from 'tagcase'

7
src/nvim/quickfix.c
View File

@@ -2595,8 +2595,11 @@ static void qf_goto_win_with_qfl_file(int qf_fnum)
if (IS_QF_WINDOW(win)) { if (IS_QF_WINDOW(win)) {
// Didn't find it, go to the window before the quickfix // Didn't find it, go to the window before the quickfix
// window. // window, unless 'switchbuf' contains 'uselast': in this case we
if (altwin != NULL) { // try to jump to the previously used window first.
if ((swb_flags & SWB_USELAST) && win_valid(prevwin)) {
win = prevwin;
} else if (altwin != NULL) {
win = altwin; win = altwin;
} else if (curwin->w_prev != NULL) { } else if (curwin->w_prev != NULL) {
win = curwin->w_prev; win = curwin->w_prev;

8
src/nvim/testdir/test_quickfix.vim
View File

@@ -1642,6 +1642,14 @@ func Test_switchbuf()
call assert_equal(3, tabpagenr('$')) call assert_equal(3, tabpagenr('$'))
tabfirst | enew | tabonly | only tabfirst | enew | tabonly | only
set switchbuf=uselast
split
let last_winid = win_getid()
copen
exe "normal 1G\<CR>"
call assert_equal(last_winid, win_getid())
enew | only
set switchbuf= set switchbuf=
edit Xqftestfile1 edit Xqftestfile1
let file1_winid = win_getid() let file1_winid = win_getid()