commit 004fe81773b09ee94ce761e464a0b2e92095fb52
from: Omar Polo <op@omarpolo.com>
date: Sat Jul 24 07:02:10 2021 UTC

drop {eecmd,ir}_self_insert in favour of sensible_self_insert

commit - 85c820b8b345337d2f8da7b663701ea9c2720944
commit + 004fe81773b09ee94ce761e464a0b2e92095fb52
blob - 9c20229a2389ce5c0bf1f3bb98133fe5cffb3ae4
blob + 9ce480ab9621f92565caa28207ccc60fd3861816
--- cmd.c
+++ cmd.c
@@ -398,7 +398,7 @@ cmd_execute_extended_command(struct buffer *buffer)
 
 	GUARD_RECURSIVE_MINIBUFFER();
 
-	enter_minibuffer(eecmd_self_insert, eecmd_select, exit_minibuffer,
+	enter_minibuffer(sensible_self_insert, eecmd_select, exit_minibuffer,
 	    &eecmd_history, compl_eecmd, NULL);
 
 	len = sizeof(ministate.prompt);
blob - 52bc17e9920905d9b76ef57f474bb6a8b392bf5f
blob + 78612ab6c5d68bccfcc6de4aa770452d85959ab6
--- minibuffer.c
+++ minibuffer.c
@@ -169,18 +169,6 @@ sensible_self_insert(void)
 {
 	if (thiskey.meta ||
 	    (!unicode_isgraph(thiskey.key) && thiskey.key != ' ')) {
-		global_key_unbound();
-		return;
-	}
-
-	minibuffer_self_insert();
-}
-
-void
-eecmd_self_insert(void)
-{
-	if (thiskey.meta || unicode_isspace(thiskey.cp) ||
-	    !unicode_isgraph(thiskey.cp)) {
 		global_key_unbound();
 		return;
 	}
@@ -203,12 +191,6 @@ eecmd_select(void)
 	}
 
 	message("No match");
-}
-
-void
-ir_self_insert(void)
-{
-	minibuffer_self_insert();
 }
 
 void
blob - 22b80a7f3ddc9ea6713aa7d2e5f1e62290cd699c
blob + e71a56a1987faeef145c59330bc2bd8c41113fb3
--- minibuffer.h
+++ minibuffer.h
@@ -73,9 +73,7 @@ void	 recompute_completions(int);
 void	 minibuffer_taint_hist(void);
 void	 minibuffer_self_insert(void);
 void	 sensible_self_insert(void);
-void	 eecmd_self_insert(void);
 void	 eecmd_select(void);
-void	 ir_self_insert(void);
 void	 ir_select(void);
 void	 lu_select(void);
 void	 bp_select(void);
blob - 6a045b8a63343f8c9e760e5fb8d8588c0346045b
blob + ee9c33d18f6bc61f73884a58eb258a060ff83d56
--- ui.c
+++ ui.c
@@ -1189,7 +1189,7 @@ ui_require_input(struct tab *tab, int hide)
 	/* TODO: hard-switching to another tab is ugly */
 	switch_to_tab(tab);
 
-	enter_minibuffer(ir_self_insert, ir_select, exit_minibuffer,
+	enter_minibuffer(sensible_self_insert, ir_select, exit_minibuffer,
 	    &ir_history, NULL, NULL);
 	strlcpy(ministate.prompt, "Input required: ",
 	    sizeof(ministate.prompt));