Mercurial > vim
changeset 24719:4ae10e6c3a9c v8.2.2898
patch 8.2.2898: QuitPre and ExitPre not triggered when GUI window is closed
Commit: https://github.com/vim/vim/commit/3552e742898cd57adaf9b8ce32a9056271eab8d2
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat May 29 12:21:58 2021 +0200
patch 8.2.2898: QuitPre and ExitPre not triggered when GUI window is closed
Problem: QuitPre and ExitPre not triggered when GUI window is closed.
Solution: Call before_quit_autocmds(). (closes https://github.com/vim/vim/issues/8242)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 29 May 2021 12:30:04 +0200 |
parents | 998269fb087b |
children | d9eba0e42630 |
files | src/ex_docmd.c src/gui.c src/proto/ex_docmd.pro src/version.c |
diffstat | 4 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -5498,7 +5498,7 @@ not_exiting(void) settmode(TMODE_RAW); } - static int + int before_quit_autocmds(win_T *wp, int quit_all, int forceit) { apply_autocmds(EVENT_QUITPRE, NULL, NULL, FALSE, wp->w_buffer); @@ -5572,7 +5572,7 @@ ex_quit(exarg_T *eap) #endif /* - * If there are more files or windows we won't exit. + * If there is only one relevant window we will exit. */ if (check_more(FALSE, eap->forceit) == OK && only_one_window()) exiting = TRUE;
--- a/src/gui.c +++ b/src/gui.c @@ -857,9 +857,10 @@ gui_exit(int rc) void gui_shell_closed(void) { - cmdmod_T save_cmdmod; - - save_cmdmod = cmdmod; + cmdmod_T save_cmdmod = cmdmod; + + if (before_quit_autocmds(curwin, TRUE, FALSE)) + return; // Only exit when there are no changed files exiting = TRUE;
--- a/src/proto/ex_docmd.pro +++ b/src/proto/ex_docmd.pro @@ -7,13 +7,13 @@ int getline_equal(char_u *(*fgetline)(in void *getline_cookie(char_u *(*fgetline)(int, void *, int, getline_opt_T), void *cookie); char_u *getline_peek(char_u *(*fgetline)(int, void *, int, getline_opt_T), void *cookie); char *ex_errmsg(char *msg, char_u *arg); +int checkforcmd(char_u **pp, char *cmd, int len); int parse_command_modifiers(exarg_T *eap, char **errormsg, cmdmod_T *cmod, int skip_only); int has_cmdmod(cmdmod_T *cmod); int cmdmod_error(void); void apply_cmdmod(cmdmod_T *cmod); void undo_cmdmod(cmdmod_T *cmod); int parse_cmd_address(exarg_T *eap, char **errormsg, int silent); -int checkforcmd(char_u **pp, char *cmd, int len); char_u *skip_option_env_lead(char_u *start); char_u *find_ex_command(exarg_T *eap, int *full, int (*lookup)(char_u *, size_t, int cmd, cctx_T *), cctx_T *cctx); int modifier_len(char_u *cmd); @@ -33,6 +33,7 @@ char_u *find_nextcmd(char_u *p); char_u *check_nextcmd(char_u *p); char_u *get_command_name(expand_T *xp, int idx); void not_exiting(void); +int before_quit_autocmds(win_T *wp, int quit_all, int forceit); void ex_quit(exarg_T *eap); void tabpage_close(int forceit); void tabpage_close_other(tabpage_T *tp, int forceit);