From 7b05ddbb72717f995fedc81583d73f82c78c881d Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sun, 16 Apr 2023 11:37:41 +0800 Subject: vim-patch:9.0.0397: :defer not tested with exceptions and ":qa!" Problem: :defer not tested with exceptions and ":qa!". Solution: Test :defer works when exceptions are thrown and when ":qa!" is used. Invoke the deferred calls on exit. https://github.com/vim/vim/commit/58779858fb5a82a3233af5d4237a3cece88c10d4 Co-authored-by: Bram Moolenaar --- src/nvim/main.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/nvim/main.c') diff --git a/src/nvim/main.c b/src/nvim/main.c index 0ef1fc9391..698c2dcc4f 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -30,6 +30,7 @@ #include "nvim/eval.h" #include "nvim/eval/typval.h" #include "nvim/eval/typval_defs.h" +#include "nvim/eval/userfunc.h" #include "nvim/event/multiqueue.h" #include "nvim/event/stream.h" #include "nvim/ex_cmds.h" @@ -693,6 +694,9 @@ void getout(int exitval) // Position the cursor on the last screen line, below all the text ui_cursor_goto(Rows - 1, 0); + // Invoked all deferred functions in the function stack. + invoke_all_defer(); + // Optionally print hashtable efficiency. hash_debug_results(); -- cgit