thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.1.0293: checks for type of stack is cryptic

Browse Source 
Problem:    Checks for type of stack is cryptic.
Solution:   Define IS_QF_STACK() and IS_LL_STACK(). (Yegappan Lakshmanan)
This commit is contained in:
Bram Moolenaar 2018-08-18 19:59:54 +02:00
parent 9bc1eac2c7
commit 4d77c65a9e
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/quickfix.c
View File

@ -159,6 +159,11 @@ static qf_info_T *ll_get_or_alloc_list(win_T *);
#define IS_QF_WINDOW(wp) (bt_quickfix(wp->w_buffer) && wp->w_llist_ref == NULL) #define IS_QF_WINDOW(wp) (bt_quickfix(wp->w_buffer) && wp->w_llist_ref == NULL)
/* Location list window check helper macro */ /* Location list window check helper macro */
#define IS_LL_WINDOW(wp) (bt_quickfix(wp->w_buffer) && wp->w_llist_ref != NULL) #define IS_LL_WINDOW(wp) (bt_quickfix(wp->w_buffer) && wp->w_llist_ref != NULL)
// Quickfix and location list stack check helper macros
#define IS_QF_STACK(qi) (qi == &ql_info)
#define IS_LL_STACK(qi) (qi != &ql_info)
/* /*
* Return location list for window 'wp' * Return location list for window 'wp'
* For location list window, return the referenced location list * For location list window, return the referenced location list
@ -1940,7 +1945,7 @@ qf_add_entry(
qfp->qf_fnum = bufnum; qfp->qf_fnum = bufnum;
if (buf != NULL) if (buf != NULL)
buf->b_has_qf_entry |= buf->b_has_qf_entry |=
(qi == &ql_info) ? BUF_HAS_QF_ENTRY : BUF_HAS_LL_ENTRY; IS_QF_STACK(qi) ? BUF_HAS_QF_ENTRY : BUF_HAS_LL_ENTRY;
} }
else else
qfp->qf_fnum = qf_get_fnum(qi, qf_idx, dir, fname); qfp->qf_fnum = qf_get_fnum(qi, qf_idx, dir, fname);
@ -2224,7 +2229,7 @@ qf_get_fnum(qf_info_T *qi, int qf_idx, char_u *directory, char_u *fname)
return 0; return 0;
buf->b_has_qf_entry = buf->b_has_qf_entry =
(qi == &ql_info) ? BUF_HAS_QF_ENTRY : BUF_HAS_LL_ENTRY; IS_QF_STACK(qi) ? BUF_HAS_QF_ENTRY : BUF_HAS_LL_ENTRY;
return buf->b_fnum; return buf->b_fnum;
} }
@ -2631,7 +2636,7 @@ jump_to_help_window(qf_info_T *qi, int *opened_window)
if (cmdmod.split == 0 && curwin->w_width != Columns if (cmdmod.split == 0 && curwin->w_width != Columns
&& curwin->w_width < 80) && curwin->w_width < 80)
flags |= WSP_TOP; flags |= WSP_TOP;
if (qi != &ql_info) if (IS_LL_STACK(qi))
flags |= WSP_NEWLOC; /* don't copy the location list */ flags |= WSP_NEWLOC; /* don't copy the location list */
if (win_split(0, flags) == FAIL) if (win_split(0, flags) == FAIL)
@ -2642,7 +2647,7 @@ jump_to_help_window(qf_info_T *qi, int *opened_window)
if (curwin->w_height < p_hh) if (curwin->w_height < p_hh)
win_setheight((int)p_hh); win_setheight((int)p_hh);
if (qi != &ql_info) /* not a quickfix list */ if (IS_LL_STACK(qi)) // not a quickfix list
{ {
/* The new window should use the supplied location list */ /* The new window should use the supplied location list */
curwin->w_llist = qi; curwin->w_llist = qi;
@ -2918,7 +2923,7 @@ qf_jump_edit_buffer(
retval = buflist_getfile(qf_ptr->qf_fnum, retval = buflist_getfile(qf_ptr->qf_fnum,
(linenr_T)1, GETF_SETMARK | GETF_SWITCH, forceit); (linenr_T)1, GETF_SETMARK | GETF_SWITCH, forceit);
if (qi != &ql_info) if (IS_LL_STACK(qi))
{ {
/* /*
* Location list. Check whether the associated window is still * Location list. Check whether the associated window is still
@ -2939,7 +2944,7 @@ qf_jump_edit_buffer(
else if (old_qf_curlist != qi->qf_curlist else if (old_qf_curlist != qi->qf_curlist
|| !is_qf_entry_present(qi, qf_ptr)) || !is_qf_entry_present(qi, qf_ptr))
{ {
if (qi == &ql_info) if (IS_QF_STACK(qi))
EMSG(_("E925: Current quickfix was changed")); EMSG(_("E925: Current quickfix was changed"));
else else
EMSG(_(e_loc_list_changed)); EMSG(_(e_loc_list_changed));
@ -4040,8 +4045,8 @@ is_qf_win(win_T *win, qf_info_T *qi)
* pointing to the location list. * pointing to the location list.
*/ */
if (bt_quickfix(win->w_buffer)) if (bt_quickfix(win->w_buffer))
if ((qi == &ql_info && win->w_llist_ref == NULL) if ((IS_QF_STACK(qi) && win->w_llist_ref == NULL)
|| (qi != &ql_info && win->w_llist_ref == qi)) || (IS_LL_STACK(qi) && win->w_llist_ref == qi))
return TRUE; return TRUE;
return FALSE; return FALSE;
@ -6955,7 +6960,7 @@ ex_helpgrep(exarg_T *eap)
{ {
apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
curbuf->b_fname, TRUE, curbuf); curbuf->b_fname, TRUE, curbuf);
if (!new_qi && qi != &ql_info && qf_find_buf(qi) == NULL) if (!new_qi && IS_LL_STACK(qi) && qf_find_buf(qi) == NULL)
/* autocommands made "qi" invalid */ /* autocommands made "qi" invalid */
return; return;
} }

2
src/version.c
View File

@ -794,6 +794,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
293,
/**/ /**/
292, 292,
/**/ /**/