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

patch 8.0.0068

Browse Source 
Problem:    Checking did_throw after executing autocommands is wrong. (Daniel
            Hahler)
Solution:   Call aborting() instead, and only when autocommands were executed.
This commit is contained in:
Bram Moolenaar
2016-11-06 14:46:44 +01:00
parent 98500fdc61
commit 21662be221
4 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/if_cscope.c
View File

@@ -1178,12 +1178,12 @@ cs_find_common(
} }
# ifdef FEAT_AUTOCMD # ifdef FEAT_AUTOCMD
if (*qfpos != '0') if (*qfpos != '0'
&& apply_autocmds(EVENT_QUICKFIXCMDPRE, (char_u *)"cscope",
curbuf->b_fname, TRUE, curbuf))
{ {
apply_autocmds(EVENT_QUICKFIXCMDPRE, (char_u *)"cscope",
curbuf->b_fname, TRUE, curbuf);
# ifdef FEAT_EVAL # ifdef FEAT_EVAL
if (did_throw || force_abort) if (aborting())
return FALSE; return FALSE;
# endif # endif
} }

39
src/quickfix.c
View File

@@ -3446,12 +3446,11 @@ ex_make(exarg_T *eap)
case CMD_lgrepadd: au_name = (char_u *)"lgrepadd"; break; case CMD_lgrepadd: au_name = (char_u *)"lgrepadd"; break;
default: break; default: break;
} }
if (au_name != NULL) if (au_name != NULL && apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
curbuf->b_fname, TRUE, curbuf))
{ {
apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
curbuf->b_fname, TRUE, curbuf);
# ifdef FEAT_EVAL # ifdef FEAT_EVAL
if (did_throw || force_abort) if (aborting())
return; return;
# endif # endif
} }
@@ -3970,12 +3969,13 @@ ex_vimgrep(exarg_T *eap)
case CMD_lgrepadd: au_name = (char_u *)"lgrepadd"; break; case CMD_lgrepadd: au_name = (char_u *)"lgrepadd"; break;
default: break; default: break;
} }
if (au_name != NULL) if (au_name != NULL && apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
curbuf->b_fname, TRUE, curbuf))
{ {
apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name, # ifdef FEAT_EVAL
curbuf->b_fname, TRUE, curbuf); if (aborting())
if (did_throw || force_abort)
return; return;
# endif
} }
#endif #endif
@@ -4875,12 +4875,11 @@ ex_cbuffer(exarg_T *eap)
case CMD_laddbuffer: au_name = (char_u *)"laddbuffer"; break; case CMD_laddbuffer: au_name = (char_u *)"laddbuffer"; break;
default: break; default: break;
} }
if (au_name != NULL) if (au_name != NULL && apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
curbuf->b_fname, TRUE, curbuf))
{ {
apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
curbuf->b_fname, TRUE, curbuf);
# ifdef FEAT_EVAL # ifdef FEAT_EVAL
if (did_throw || force_abort) if (aborting())
return; return;
# endif # endif
} }
@@ -4966,12 +4965,11 @@ ex_cexpr(exarg_T *eap)
case CMD_laddexpr: au_name = (char_u *)"laddexpr"; break; case CMD_laddexpr: au_name = (char_u *)"laddexpr"; break;
default: break; default: break;
} }
if (au_name != NULL) if (au_name != NULL && apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
curbuf->b_fname, TRUE, curbuf))
{ {
apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
curbuf->b_fname, TRUE, curbuf);
# ifdef FEAT_EVAL # ifdef FEAT_EVAL
if (did_throw || force_abort) if (aborting())
return; return;
# endif # endif
} }
@@ -5042,12 +5040,13 @@ ex_helpgrep(exarg_T *eap)
case CMD_lhelpgrep: au_name = (char_u *)"lhelpgrep"; break; case CMD_lhelpgrep: au_name = (char_u *)"lhelpgrep"; break;
default: break; default: break;
} }
if (au_name != NULL) if (au_name != NULL && apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name,
curbuf->b_fname, TRUE, curbuf))
{ {
apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name, # ifdef FEAT_EVAL
curbuf->b_fname, TRUE, curbuf); if (aborting())
if (did_throw || force_abort)
return; return;
# endif
} }
#endif #endif

17
src/testdir/test_quickfix.vim
View File

@@ -1631,3 +1631,20 @@ function Test_Autocmd()
\ 'postcaddbuffer'] \ 'postcaddbuffer']
call assert_equal(l, g:acmds) call assert_equal(l, g:acmds)
endfunction endfunction
function! Test_Autocmd_Exception()
set efm=%m
lgetexpr '?'
try
call DoesNotExit()
catch
lgetexpr '1'
finally
lgetexpr '1'
endtry
call assert_equal('1', getloclist(0)[0].text)
set efm&vim
endfunction

2
src/version.c
View File

@@ -764,6 +764,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 */
/**/
68,
/**/ /**/
67, 67,
/**/ /**/