commit 7e435604f2f764fd8c6d63f6240af21b82cd0e01
from: Omar Polo <op@omarpolo.com>
date: Mon Jun 24 09:36:12 2024 UTC

minibuffer: assume exit_minibuffer as abortfn

commit - c58259f814c52c53765149e7fa6be42248f66c74
commit + 7e435604f2f764fd8c6d63f6240af21b82cd0e01
blob - 5166bb92007b10bf358f59ffe7e3566e82816bed
blob + d936a6e02a54c4fec85e5167dc1a6bdb232632c1
--- cmd.c
+++ cmd.c
@@ -432,7 +432,6 @@ cmd_execute_extended_command(struct buffer *buffer)
 	struct minibuffer	 m = {
 		.self_insert = sensible_self_insert,
 		.done = eecmd_select,
-		.abort = exit_minibuffer,
 		.history = eecmd_history,
 		.complfn = compl_eecmd,
 		.must_select = 1,
@@ -551,7 +550,6 @@ cmd_tab_select(struct buffer *buffer)
 	struct minibuffer m = {
 		.self_insert = sensible_self_insert,
 		.done = ts_select,
-		.abort = exit_minibuffer,
 		.complfn = compl_ts,
 		.must_select = 1,
 	};
@@ -567,7 +565,6 @@ cmd_load_url(struct buffer *buffer)
 	struct minibuffer m = {
 		.self_insert = sensible_self_insert,
 		.done = lu_select,
-		.abort = exit_minibuffer,
 		.history = lu_history,
 		.complfn = compl_lu,
 	};
@@ -583,7 +580,6 @@ cmd_load_current_url(struct buffer *buffer)
 	struct minibuffer m = {
 		.self_insert = sensible_self_insert,
 		.done = lu_select,
-		.abort = exit_minibuffer,
 		.history = lu_history,
 		.complfn = compl_lu,
 		.input = hist_cur(current_tab->hist),
@@ -607,7 +603,6 @@ cmd_bookmark_page(struct buffer *buffer)
 	struct minibuffer m = {
 		.self_insert = sensible_self_insert,
 		.done = bp_select,
-		.abort = exit_minibuffer,
 		.input = hist_cur(current_tab->hist),
 	};
 
@@ -635,7 +630,6 @@ cmd_link_select(struct buffer *buffer)
 	struct minibuffer m = {
 		.self_insert = sensible_self_insert,
 		.done = ls_select,
-		.abort = exit_minibuffer,
 		.complfn = compl_ls,
 		.compldata = NULL,
 		.must_select = 1,
@@ -662,7 +656,6 @@ cmd_swiper(struct buffer *buffer)
 	struct minibuffer m = {
 		.self_insert = sensible_self_insert,
 		.done = swiper_select,
-		.abort = exit_minibuffer,
 		.complfn = compl_swiper,
 		.compldata = TAILQ_FIRST(&buffer->head),
 		.must_select = 1,
@@ -680,7 +673,6 @@ cmd_toc(struct buffer *buffer)
 	struct minibuffer m = {
 		.self_insert = sensible_self_insert,
 		.done = toc_select,
-		.abort = exit_minibuffer,
 		.complfn = compl_toc,
 		.compldata = NULL,
 		.must_select = 1,
@@ -1154,7 +1146,6 @@ cmd_use_certificate(struct buffer *buffer)
 	struct minibuffer m = {
 		.self_insert = sensible_self_insert,
 		.done = uc_select,
-		.abort = exit_minibuffer,
 		.complfn = compl_uc,
 		.must_select = 1,
 	};
@@ -1210,7 +1201,6 @@ cmd_search(struct buffer *buffer)
 	struct minibuffer m = {
 		.self_insert = sensible_self_insert,
 		.done = search_select,
-		.abort = exit_minibuffer,
 	};
 
 	GUARD_RECURSIVE_MINIBUFFER();
blob - c2492dae05742b28e50c5979878ae272ed991f43
blob + c8c712d92f362f43f674772556383b9cd8732aae
--- minibuffer.c
+++ minibuffer.c
@@ -594,6 +594,8 @@ enter_minibuffer(struct minibuffer *minibuffer, const 
 
 	ministate.donefn = minibuffer->done;
 	ministate.abortfn = minibuffer->abort;
+	if (ministate.abortfn == NULL)
+		ministate.abortfn = exit_minibuffer;
 
 	ministate.buffer.cpoff = 0;
 	if (minibuffer->input) {
blob - 941159cefca7f3fa6b04a98b83403efecdcbd827
blob + 770df02c5777a367eec451f0d2a622e8478001d9
--- ui.c
+++ ui.c
@@ -1344,7 +1344,6 @@ ui_require_input(struct tab *tab, int hide, void (*fn)
 	struct minibuffer m = {
 		.self_insert = sensible_self_insert,
 		.done = fn,
-		.abort = exit_minibuffer,
 		.history = ir_history,
 	};